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@xxxxxxxxxxxxxxxx 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:
pgpW47IMrnOEx.pgp
Description: PGP signature