Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/e800_wm9712.c between commit
f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
#include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
Toshiba e800") from the sound tree.
Just overlapping context changes. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc sound/soc/pxa/e800_wm9712.c
index ac294c7,78a1770..0000000
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@@ -20,8 -18,12 +18,10 @@@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
- #include <asm/mach-types.h>
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
#include <mach/audio.h>
+ #include <mach/eseries-gpio.h>
+
+ #include <asm/mach-types.h>
#include "../codecs/wm9712.h"
#include "pxa2xx-pcm.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
