lkml.org 
[lkml]   [2012]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the l2-mtd tree with the m68k tree
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>

/****************************************************************************/

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-06-28 05:21    [W:0.025 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site