Merge git://git.infradead.org/~dwmw2/cafe-2.6

Conflicts:

	drivers/mtd/nand/Kconfig

diff --combined drivers/mtd/nand/Kconfig
index b4b1656,5e97e63..564f79d
--- 1/drivers/mtd/nand/Kconfig
--- 2/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -21,7 -21,7 +21,7 @@@ config MTD_NAND_VERIFY_WRIT
          NAND flash device internally checks only bits transitioning
          from 1 to 0. There is a rare possibility that even though the
          device thinks the write was successful, a bit could have been
 -        flipped accidentaly due to device wear or something else.
 +        flipped accidentally due to device wear or something else.
  
  config MTD_NAND_ECC_SMC
        bool "NAND ECC Smart Media byte order"
@@@ -219,6 -219,6 +219,13 @@@ config MTD_NAND_SHARPS
        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
        depends on MTD_NAND && ARCH_PXA
  
++config MTD_NAND_CAFE
++       tristate "NAND support for OLPC CAFÉ chip"
++       depends on PCI
++       help
++       Use NAND flash attached to the CAFÉ chip designed for the $100
++       laptop.
++
  config MTD_NAND_CS553X
        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
        depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)
@@@ -232,12 -232,12 +239,12 @@@
  
          If you say "m", the module will be called "cs553x_nand.ko".
  
 -config MTD_NAND_CAFE
 -       tristate "NAND support for OLPC CAFÉ chip"
 -       depends on PCI
 -       help
 -       Use NAND flash attached to the CAFÉ chip designed for the $100
 -       laptop.
 +config MTD_NAND_AT91
 +      bool "Support for NAND Flash / SmartMedia on AT91"
 +      depends on MTD_NAND && ARCH_AT91
 +      help
 +        Enables support for NAND Flash / Smart Media Card interface
 +        on Atmel AT91 processors.
  
  config MTD_NAND_NANDSIM
        tristate "Support for NAND Flash Simulator"

diff --combined drivers/mtd/nand/Makefile
index 27c9f0a,9346b83..7cebc10
--- 1/drivers/mtd/nand/Makefile
--- 2/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -6,6 -6,7 +6,7 @@@
  obj-$(CONFIG_MTD_NAND)                        += nand.o nand_ecc.o
  obj-$(CONFIG_MTD_NAND_IDS)            += nand_ids.o
  
+ obj-$(CONFIG_MTD_NAND_CAFE)           += cafe_nand.o
  obj-$(CONFIG_MTD_NAND_SPIA)           += spia.o
  obj-$(CONFIG_MTD_NAND_AMS_DELTA)      += ams-delta.o
  obj-$(CONFIG_MTD_NAND_TOTO)           += toto.o
@@@ -22,6 -23,5 +23,6 @@@ 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_AT91)           += at91_nand.o
  
  nand-objs = nand_base.o nand_bbt.o