Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/mach-bcmring/mm.c between commit 2d5e975b2194 ("ARM:
mach-bcmring: Setup consistent dma size at boot time") from the arm tree
and commit 9bc7d81e271e ("arm: fix implicit use of page.h in
mach-bcmring/mach-jornada") from the moduleh tree.
Jst context changes I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-bcmring/mm.c
index 8616876,293b6d3..0000000
--- a/arch/arm/mach-bcmring/mm.c
+++ b/arch/arm/mach-bcmring/mm.c
@@@ -13,7 -13,7 +13,8 @@@
*****************************************************************************/
#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+ #include <asm/page.h>
#include <asm/mach/map.h>
#include <mach/hardware.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
