From: Tony Lindgren <tony@atomide.com>
Date: Thu, 25 Jan 2007 22:21:41 +0000 (-0800)
Subject: Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/
X-Git-Tag: v2.6.21-omap1~151
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f6a5d6a63591af9e0ee908644c137e2b72a87c9b;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/

Conflicts:

	drivers/mmc/omap.c
	drivers/mtd/nand/Makefile
---

f6a5d6a63591af9e0ee908644c137e2b72a87c9b
diff --cc drivers/mtd/nand/Makefile
index e7cf382297a,f7a53f0b701..69da27e2285
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -22,7 -23,7 +23,9 @@@ obj-$(CONFIG_MTD_NAND_TS7250)		+= ts725
  obj-$(CONFIG_MTD_NAND_NANDSIM)		+= nandsim.o
  obj-$(CONFIG_MTD_NAND_CS553X)		+= cs553x_nand.o
  obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
 +obj-$(CONFIG_MTD_NAND_OMAP) 		+= omap-nand-flash.o
 +obj-$(CONFIG_MTD_NAND_OMAP_HW)		+= omap-hw.o
+ obj-$(CONFIG_MTD_NAND_AT91)		+= at91_nand.o
  
- nand-objs = nand_base.o nand_bbt.o
+ nand-objs := nand_base.o nand_bbt.o
+ cafe_nand-objs := cafe.o cafe_ecc.o