linux-next: manual merge of the l2-mtd tree with the m68k tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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
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

[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux