From patchwork Tue Oct 2 19:03:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ball X-Patchwork-Id: 1538541 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 9C92ADFFAD for ; Tue, 2 Oct 2012 19:06:14 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJ7lV-0001vA-MY; Tue, 02 Oct 2012 19:04:21 +0000 Received: from void.printf.net ([89.145.121.20]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJ7lT-0001u2-7C for linux-arm-kernel@lists.infradead.org; Tue, 02 Oct 2012 19:04:20 +0000 Received: from c-76-24-28-220.hsd1.ma.comcast.net ([76.24.28.220] helo=octavius.laptop.org) by void.printf.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1TJ7kd-0005pl-Rw; Tue, 02 Oct 2012 20:03:28 +0100 From: Chris Ball To: Arnd Bergmann Subject: [PATCH] ARM: pxa: Fix build error caused by sram.h rename References: <1347368350-31212-1-git-send-email-arnd@arndb.de> <1347368390-31252-1-git-send-email-arnd@arndb.de> <1347368390-31252-7-git-send-email-arnd@arndb.de> Date: Tue, 02 Oct 2012 15:03:21 -0400 In-Reply-To: <1347368390-31252-7-git-send-email-arnd@arndb.de> (Arnd Bergmann's message of "Tue, 11 Sep 2012 14:59:41 +0200") Message-ID: <87fw5wofwm.fsf_-_@octavius.laptop.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [89.145.121.20 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Dmitry Torokhov , Takashi Iwai , Artem Bityutskiy , Sergey Lapin , Jaroslav Kysela , Jonathan Cameron , Philipp Zabel , Robert Jarzmik , Harald Welte , openezx-devel@lists.openezx.org, Russell King , Florian Tobias Schandinat , Vinod Koul , Marek Vasut , Alan Stern , Paul Parsons , Jeff Garzik , Liam Girdwood , Daniel Ribeiro , Samuel Ortiz , Haojian Zhuang , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Stefan Schmidt , Eric Miao , Greg Kroah-Hartman , Mark Brown , linux-kernel@vger.kernel.org, Dan Williams , Tomas Cech , David Woodhouse , Guennadi Liakhovetski 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") renamed arch/arm/mach-mmp/include/mach/sram.h to include/linux/platform_data/dma-mmp_tdma.h, but didn't update mmp-pcm.c which uses the header. Fix the build error. Signed-off-by: Chris Ball Acked-by: Arnd Bergmann --- sound/soc/pxa/mmp-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 73ac546..e834faf 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -15,13 +15,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include struct mmp_dma_data {