From patchwork Wed Jun 20 04:19:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 9460 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4143C23E53 for ; Wed, 20 Jun 2012 04:30:54 +0000 (UTC) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by fiordland.canonical.com (Postfix) with ESMTP id 03A67A184CF for ; Wed, 20 Jun 2012 04:30:53 +0000 (UTC) Received: by obbuo19 with SMTP id uo19so1652353obb.11 for ; Tue, 19 Jun 2012 21:30:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=NCg86zD6ruWxb9ND0N8vhPYm2r202NObDqss54CJtYs=; b=G4ZsNyeY3TnTerSvj6MldBcbW/xzAAW/FUS/0vc2EErcoazM5eqc9ouUYbN1cWV4xB PMxatq1SjJgm1Q1KOr+fhGBG4d3qW+E3flcg82VSXbLlg5FA3oPl2JTPQ9+mYu9Msbnk M2lFcnyECJaxir5twmhOjw9AyRv9IPj3peZlUoWf7iiRnIANmXCFEs05+MXSAdySWeim elWGsngcUykSTtEfOPzX16ce8qEI0ZofByIY1AbaCY7wP/Snp8MDu6rZApAlc8ipW1Cv 6wUvg5QnRzvqxlaCd+IKc5rtHPe7LRYYN8ePAxhL3O1vPEc5YyqwmvjGJorQCXl9qHaH jJlA== Received: by 10.50.195.234 with SMTP id ih10mr3347942igc.0.1340166653036; Tue, 19 Jun 2012 21:30:53 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp160443ibb; Tue, 19 Jun 2012 21:30:52 -0700 (PDT) Received: by 10.68.203.73 with SMTP id ko9mr73141583pbc.66.1340166652264; Tue, 19 Jun 2012 21:30:52 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id tm4si16519048pbc.152.2012.06.19.21.30.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 19 Jun 2012 21:30:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by danh15 with SMTP id h15so10637797dan.37 for ; Tue, 19 Jun 2012 21:30:52 -0700 (PDT) Received: by 10.68.223.167 with SMTP id qv7mr70828055pbc.127.1340166651857; Tue, 19 Jun 2012 21:30:51 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id qp9sm12856557pbc.9.2012.06.19.21.30.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 19 Jun 2012 21:30:51 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] ARM: SAMSUNG: Fix compilation error Date: Wed, 20 Jun 2012 09:49:10 +0530 Message-Id: <1340165950-8996-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmGSR46DwdQuMrZL2yhP7GwaIIqB07QcjyBlYKoYwzUDBdAsRdih/WO9XkGd8Dg9L3KLLPC Fixes the following build error: In file included from arch/arm/mach-exynos/include/mach/dma.h:24:0, from arch/arm/plat-samsung/include/plat/dma-ops.h:17, from arch/arm/plat-samsung/include/plat/dma.h:128, from sound/soc/samsung/pcm.c:23: arch/arm/plat-samsung/include/plat/dma-pl330.h:106:8: error: redefinition of ‘struct s3c2410_dma_client’ arch/arm/plat-samsung/include/plat/dma.h:40:8: note: originally defined here Signed-off-by: Sachin Kamat --- arch/arm/plat-samsung/include/plat/dma.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-samsung/include/plat/dma.h b/arch/arm/plat-samsung/include/plat/dma.h index 7b02143..fdf34bc 100644 --- a/arch/arm/plat-samsung/include/plat/dma.h +++ b/arch/arm/plat-samsung/include/plat/dma.h @@ -37,10 +37,7 @@ enum s3c2410_chan_op { S3C2410_DMAOP_STARTED, /* indicate channel started */ }; -struct s3c2410_dma_client { - char *name; -}; - +struct s3c2410_dma_client; struct s3c2410_dma_chan; enum dma_ch;