From patchwork Tue Aug 28 18:59:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1382261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 66CAEDF283 for ; Tue, 28 Aug 2012 19:03:27 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T6R0z-0008EK-Jx; Tue, 28 Aug 2012 18:59:53 +0000 Received: from mail.free-electrons.com ([88.190.12.23]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T6R0g-0008C0-Tx for linux-arm-kernel@lists.infradead.org; Tue, 28 Aug 2012 18:59:36 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 8968A2B7; Tue, 28 Aug 2012 20:59:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, KHOP_BIG_TO_CC shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (unknown [38.96.16.75]) by mail.free-electrons.com (Postfix) with ESMTPSA id DE7FA1A6; Tue, 28 Aug 2012 20:59:21 +0200 (CEST) From: Thomas Petazzoni To: Jason Cooper , Andrew Lunn , Gregory Clement Subject: [PATCH 2/8] sound: kirkwood: move to Date: Tue, 28 Aug 2012 20:59:03 +0200 Message-Id: <1346180349-25123-3-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346180349-25123-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1346180349-25123-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lior Amsalem , Ike Pan , Albert Stone , Nadav Haklai , Ian Molton , David Marlin , Yehuda Yitschak , Jani Monoses , Tawfik Bayouk , Dan Frazier , Eran Ben-Avi , Li Li , Leif Lindholm , Sebastian Hesselbarth , Arnd Bergmann , Jon Masters , Ben Dooks , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Chris Van Hoof , Nicolas Pitre , Maen Suleiman , Shadi Ammouri , Olof Johansson , Eric Miao X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Thomas Petazzoni --- arch/arm/mach-kirkwood/common.c | 2 +- arch/arm/plat-orion/include/plat/audio.h | 7 ------- include/linux/platform_data/kirkwood-audio.h | 7 +++++++ sound/soc/kirkwood/kirkwood-i2s.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 arch/arm/plat-orion/include/plat/audio.h create mode 100644 include/linux/platform_data/kirkwood-audio.h diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index c4b64ad..138ba47 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/plat-orion/include/plat/audio.h b/arch/arm/plat-orion/include/plat/audio.h deleted file mode 100644 index d6a55bd..0000000 --- a/arch/arm/plat-orion/include/plat/audio.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __PLAT_AUDIO_H -#define __PLAT_AUDIO_H - -struct kirkwood_asoc_platform_data { - int burst; -}; -#endif diff --git a/include/linux/platform_data/kirkwood-audio.h b/include/linux/platform_data/kirkwood-audio.h new file mode 100644 index 0000000..a2c25da --- /dev/null +++ b/include/linux/platform_data/kirkwood-audio.h @@ -0,0 +1,7 @@ +#ifndef __KIRKWOOD_AUDIO_PDATA_H +#define __KIRKWOOD_AUDIO_PDATA_H + +struct kirkwood_asoc_platform_data { + int burst; +}; +#endif diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 7646dd7..c4dd2f1 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "kirkwood.h" #define DRV_NAME "kirkwood-i2s"