From: cjb@laptop•org (Chris Ball)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: pxa: Fix build error caused by sram.h rename
Date: Sat, 06 Oct 2012 07:38:16 -0400 [thread overview]
Message-ID: <87vcenespj.fsf@octavius.laptop.org> (raw)
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
next reply other threads:[~2012-10-06 11:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-06 11:38 Chris Ball [this message]
2012-10-09 6:29 ` [PATCH] ARM: pxa: Fix build error caused by sram.h rename 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vcenespj.fsf@octavius.laptop.org \
--to=cjb@laptop$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox