linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
@ 2012-10-06 11:38 Chris Ball
  2012-10-09  6:29 ` Mark Brown
  0 siblings, 1 reply; 86+ messages in thread
From: Chris Ball @ 2012-10-06 11:38 UTC (permalink / raw)
  To: linux-arm-kernel

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 <cjb@laptop.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
 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 <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
+#include <linux/platform_data/dma-mmp_tdma.h>
 #include <linux/platform_data/mmp_audio.h>
 #include <sound/pxa2xx-lib.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <mach/sram.h>
 #include <sound/dmaengine_pcm.h>
 
 struct mmp_dma_data {

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply related	[flat|nested] 86+ messages in thread
end of thread, other threads:[~2012-10-09  6:29 UTC | newest]

Thread overview: 86+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59   ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59     ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 13:05       ` Felipe Balbi
2012-09-12 10:42       ` Hebbar, Gururaja
2012-09-12 17:11         ` Arnd Bergmann
2012-09-13  7:00           ` Hebbar, Gururaja
2012-09-11 12:59     ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26       ` H Hartley Sweeten
2012-09-11 17:16         ` Arnd Bergmann
2012-09-11 22:56       ` Ryan Mallon
2012-09-14  3:18       ` Vinod Koul
2012-09-11 12:59     ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40       ` Guennadi Liakhovetski
2012-09-11 14:10         ` Arnd Bergmann
2012-09-11 14:31           ` Guennadi Liakhovetski
2012-09-12 15:52             ` Arnd Bergmann
2012-09-13  7:21               ` Shawn Guo
2012-09-11 13:45       ` Sascha Hauer
2012-09-14  3:17       ` Vinod Koul
2012-09-11 12:59     ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
2012-09-11 21:07       ` David Brown
2012-09-11 12:59     ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
2012-09-11 13:35       ` Sascha Hauer
2012-09-11 12:59     ` [PATCH 07/16] ARM: pxa: " Arnd Bergmann
2012-09-11 13:56       ` Igor Grinberg
2012-09-11 17:11       ` Jeff Garzik
2012-09-11 19:13       ` Marek Vasut
2012-09-11 19:36       ` Robert Jarzmik
2012-09-12 22:56       ` Paul Parsons
2012-09-13  8:46       ` stefan at sostec.de
2012-10-02 19:03       ` [PATCH] ARM: pxa: Fix build error caused by sram.h rename Chris Ball
2012-10-02 20:27         ` Arnd Bergmann
2012-10-05 14:48           ` Chris Ball
2012-10-05 18:57             ` Arnd Bergmann
2012-10-06  8:55               ` Mark Brown
2012-09-11 12:59     ` [PATCH 08/16] ARM: sa1100: move platform_data definitions Arnd Bergmann
2012-09-11 12:59     ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 15:35       ` Stephen Warren
2012-09-12 16:21         ` Arnd Bergmann
2012-09-12 17:29           ` Stephen Warren
2012-09-11 15:42       ` Chris Ball
2012-09-11 17:05         ` Arnd Bergmann
2012-09-11 17:11           ` Chris Ball
2012-09-12 16:42           ` Chris Brand
2012-09-11 12:59     ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
2012-09-11 20:54       ` Tony Prisk
2012-09-11 12:59     ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
2012-09-11 12:59     ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 13:07       ` Felipe Balbi
2012-09-11 13:31       ` Linus Walleij
2012-09-11 13:46         ` Arnd Bergmann
2012-09-12 16:24         ` Arnd Bergmann
2012-09-11 12:59     ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:52       ` Peter Ujfalusi
2012-09-12 17:20         ` Arnd Bergmann
2012-09-18  9:57           ` Peter Ujfalusi
2012-09-19 14:49             ` Arnd Bergmann
2012-09-12  7:16       ` Pihet-XID, Jean
2012-09-12 17:15         ` Arnd Bergmann
2012-09-12 17:40           ` Pihet-XID, Jean
2012-09-11 13:20     ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35       ` Nicolas Ferre
2012-09-11 18:29     ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
2012-09-14  3:18     ` [PATCH 01/16] ARM: at91: " Vinod Koul
2012-09-11 13:02   ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02     ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:11       ` Thomas Petazzoni
2012-09-11 13:02     ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07       ` Felipe Balbi
2012-09-11 17:12       ` Jeff Garzik
2012-09-12  1:27       ` Jingoo Han
2012-09-12  2:20       ` Kukjin Kim
2012-09-12  5:44       ` Kyungmin Park
2012-09-11 13:02     ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-12  3:17       ` viresh kumar
2012-09-11 14:06     ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
2012-09-11 14:17       ` Arnd Bergmann
2012-09-11 14:24         ` Shilimkar, Santosh
2012-09-11 16:09           ` Vaibhav Hiremath
2012-09-11 17:04             ` Arnd Bergmann
2012-09-11 17:36               ` Tony Lindgren
2012-09-12  3:53               ` Hiremath, Vaibhav
2012-09-12 17:55               ` Sekhar Nori
2012-10-06 11:38 [PATCH] ARM: pxa: Fix build error caused by sram.h rename Chris Ball
2012-10-09  6:29 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).