* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
2012-09-11 12:59 ` [PATCH 07/16] ARM: pxa: " Arnd Bergmann
@ 2012-10-02 19:03 ` Chris Ball
2012-10-02 20:27 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Chris Ball @ 2012-10-02 19:03 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>
---
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] 7+ messages in thread
* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
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
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2012-10-02 20:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 02 October 2012, Chris Ball wrote:
> 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>
> ---
> 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 {
Acked-by: Arnd Bergmann <arnd@arndb.de>
Sorry I didn't catch this earlier. The file was only recently added
and somehow didn't appear in my build tests.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
2012-10-02 20:27 ` Arnd Bergmann
@ 2012-10-05 14:48 ` Chris Ball
2012-10-05 18:57 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Chris Ball @ 2012-10-05 14:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
On Tue, Oct 02 2012, Arnd Bergmann wrote:
> On Tuesday 02 October 2012, Chris Ball wrote:
>> 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>
>> ---
>> sound/soc/pxa/mmp-pcm.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
>
> Sorry I didn't catch this earlier. The file was only recently added
> and somehow didn't appear in my build tests.
Thanks. Do you want to send this to mainline, or should Mark do it?
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
2012-10-05 14:48 ` Chris Ball
@ 2012-10-05 18:57 ` Arnd Bergmann
2012-10-06 8:55 ` Mark Brown
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2012-10-05 18:57 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 05 October 2012, Chris Ball wrote:
> On Tue, Oct 02 2012, Arnd Bergmann wrote:
> > On Tuesday 02 October 2012, Chris Ball wrote:
> >> 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>
> >> ---
> >> sound/soc/pxa/mmp-pcm.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> >
> > Sorry I didn't catch this earlier. The file was only recently added
> > and somehow didn't appear in my build tests.
>
> Thanks. Do you want to send this to mainline, or should Mark do it?
>
I think it's better for Mark to queue it up than me. sound/soc/
is his domain, and I don't have any other patches that would go
along with this fix.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
2012-10-05 18:57 ` Arnd Bergmann
@ 2012-10-06 8:55 ` Mark Brown
0 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2012-10-06 8:55 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 05, 2012 at 06:57:00PM +0000, Arnd Bergmann wrote:
> On Friday 05 October 2012, Chris Ball wrote:
> > Thanks. Do you want to send this to mainline, or should Mark do it?
> I think it's better for Mark to queue it up than me. sound/soc/
> is his domain, and I don't have any other patches that would go
> along with this fix.
Can someone send me the patch please (possibly with a slightly smaller
CC list)?
^ permalink raw reply [flat|nested] 7+ messages in thread
* [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; 7+ 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] 7+ messages in thread
* [PATCH] ARM: pxa: Fix build error caused by sram.h rename
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
0 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2012-10-09 6:29 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Oct 06, 2012 at 07:38:16AM -0400, Chris Ball wrote:
> 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.
Applied, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-10-09 6:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
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 07/16] ARM: pxa: " Arnd Bergmann
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
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).