* linux-next: manual merge of the l2-mtd tree with the m68k tree
@ 2012-06-28 2:44 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-06-28 2:44 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Geert Uytterhoeven, Greg Ungerer
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/maps/uclinux.c between commit 363737d66427 ("mtd/uclinux: Use
generic __bss_stop instead of _ebss") from the tree and commit
1dc247e972b3 ("mtd: clean up uclinux.c map driver") from the l2-mtd tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/mtd/maps/uclinux.c
index c3bb304,ded7916..0000000
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@@ -17,9 -16,6 +16,7 @@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
- #include <asm/io.h>
+#include <asm/sections.h>
/****************************************************************************/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-28 2:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-28 2:44 linux-next: manual merge of the l2-mtd tree with the m68k tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.