From patchwork Wed Aug 8 06:04:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 10572 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 2BFF523EB4 for ; Wed, 8 Aug 2012 06:06:19 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id DFA8BA190E6 for ; Wed, 8 Aug 2012 06:06:18 +0000 (UTC) Received: by yenq6 with SMTP id q6so410948yen.11 for ; Tue, 07 Aug 2012 23:06:18 -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=tbCX7juy5ZB2oIDAw/wz6RpQJ2C4Tk9ZuP94Rw6SPBk=; b=hwkYFwn7+iH0Q6kybcpKfN2Vp6tnuFRr77nbUVOB9oW5r0kFdIVhr1OA781j/LiQYz TSYkExqBSGAooZcVBNi3erpobBPEuK39Th/rEni3nAl2CX7oqOkjLH2f7RB81ytggI4s Jjxno3qGK341Xd3GDOLvbZ3jsrYUh+G/w5RyIOsx/oussZE/rS2veSgmANEciSNsahMx CcOpbCrDdQ4yk8iLIug2MCcQ1tIpz0pstLWs7EPxWkHDR+rdsPNLj/702sMCWC9cJDf+ ZbEH4KtbYOFCcqAR17GG/MkTAcIR0Kg+WuDWg85PPxPclYaNyTjM5A2E72f0FbfXSXzM WIhw== Received: by 10.42.75.73 with SMTP id z9mr13187877icj.46.1344405978170; Tue, 07 Aug 2012 23:06:18 -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.50.184.200 with SMTP id ew8csp591194igc; Tue, 7 Aug 2012 23:06:17 -0700 (PDT) Received: by 10.236.113.145 with SMTP id a17mr15612803yhh.15.1344405977041; Tue, 07 Aug 2012 23:06:17 -0700 (PDT) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id e22si23900744yhh.93.2012.08.07.23.06.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 23:06:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by yenm2 with SMTP id m2so479503yen.37 for ; Tue, 07 Aug 2012 23:06:16 -0700 (PDT) Received: by 10.68.190.102 with SMTP id gp6mr33521110pbc.5.1344405976270; Tue, 07 Aug 2012 23:06:16 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id ru4sm9285166pbc.66.2012.08.07.23.06.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 23:06:15 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org, alsa-devel@alsa-project.org Cc: kgene.kim@samsung.com, broonie@opensource.wolfsonmicro.com, sachin.kamat@linaro.org, patches@linaro.org, sbkim73@samsung.com Subject: [PATCH] ASoC: Samsung: Fix build error Date: Wed, 8 Aug 2012 11:34:43 +0530 Message-Id: <1344405883-27603-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: ALoCoQkWHUkfjHIFEPmcg3qrYyf4qMaiOTtA7MbFb9FoJVckKyl9WvQgwHsCgXs861GaUwnEDSTC 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 make[3]: *** [sound/soc/samsung/pcm.o] Error 1 Cc: Kukjin Kim Signed-off-by: Sachin Kamat Signed-off-by: Sachin Kamat --- sound/soc/samsung/pcm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index b7b2a1f..89b0646 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include "dma.h" #include "pcm.h"