Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-arm/arch-omap/onenand.h

diff --combined arch/arm/plat-omap/include/mach/onenand.h
index e30237117b69b75332e9b2d1cf00c963ed72cc72,d57f20226b28733743c35455bb798836ba34f299..4649d302c263723abb48c6c33579d39f96813e4f
--- 1/include/asm-arm/arch-omap/onenand.h
--- 2/arch/arm/plat-omap/include/mach/onenand.h
+++ b/arch/arm/plat-omap/include/mach/onenand.h
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * include/asm-arm/arch-omap/onenand.h
+  * arch/arm/plat-omap/include/mach/onenand.h
   *
   * Copyright (C) 2006 Nokia Corporation
   * Author: Juha Yrjola
@@@ -16,11 -16,6 +16,10 @@@ struct omap_onenand_platform_data 
        int                     gpio_irq;
        struct mtd_partition    *parts;
        int                     nr_parts;
 -      int                     (*onenand_setup)(void __iomem *);
 +      int                     (*onenand_setup)(void __iomem *, int freq);
        int                     dma_channel;
  };
- 
 +
 +int omap2_onenand_rephase(void);
 +
 +#define ONENAND_MAX_PARTITIONS 8

diff --combined drivers/mtd/nand/Kconfig
index 572c842e9f4008687ba40ade4aa3a926a78c6fd1,41f361c49b32b73344b62f0838eb35647328dceb..8eb2b06cf0d94d61a08e3a6dc801898c4df88de3
--- 1/drivers/mtd/nand/Kconfig
--- 2/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -68,6 -68,12 +68,6 @@@ config MTD_NAND_AMS_DELT
        help
          Support for NAND flash on Amstrad E3 (Delta).
  
 -config MTD_NAND_TOTO
 -      tristate "NAND Flash device on TOTO board"
 -      depends on ARCH_OMAP && BROKEN
 -      help
 -        Support for NAND flash on Texas Instruments Toto platform.
 -
  config MTD_NAND_TS7250
        tristate "NAND Flash device on TS-7250 board"
        depends on MACH_TS72XX
@@@ -345,6 -351,13 +345,13 @@@ config MTD_NAND_PASEM
          Enables support for NAND Flash interface on PA Semi PWRficient
          based boards
  
+ config MTD_NAND_TMIO
+       tristate "NAND Flash device on Toshiba Mobile IO Controller"
+       depends on MTD_NAND && MFD_TMIO
+       help
+         Support for NAND flash connected to a Toshiba Mobile IO
+         Controller in some PDAs, including the Sharp SL6000x.
+ 
  config MTD_NAND_NANDSIM
        tristate "Support for NAND Flash Simulator"
        depends on MTD_PARTITIONS

diff --combined drivers/mtd/nand/Makefile
index b55e4c69fea6600bbb566a4f2604ad5cf94c79b4,b786c5da82da227fe388bf468c6dc370caee49ea..8540c46ffba9bd6bd6b830f3cccba3e98d259f93
--- 1/drivers/mtd/nand/Makefile
--- 2/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -8,6 -8,7 +8,6 @@@ obj-$(CONFIG_MTD_NAND_IDS)               += nand_ids
  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
  obj-$(CONFIG_MTD_NAND_AUTCPU12)               += autcpu12.o
  obj-$(CONFIG_MTD_NAND_EDB7312)                += edb7312.o
  obj-$(CONFIG_MTD_NAND_AU1550)         += au1550nd.o
@@@ -26,6 -27,7 +26,7 @@@ obj-$(CONFIG_MTD_NAND_ATMEL)          += atmel_
  obj-$(CONFIG_MTD_NAND_CM_X270)                += cmx270_nand.o
  obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)  += excite_nandflash.o
  obj-$(CONFIG_MTD_NAND_PXA3xx)         += pxa3xx_nand.o
+ obj-$(CONFIG_MTD_NAND_TMIO)           += tmio_nand.o
  obj-$(CONFIG_MTD_NAND_PLATFORM)               += plat_nand.o
  obj-$(CONFIG_MTD_ALAUDA)              += alauda.o
  obj-$(CONFIG_MTD_NAND_PASEMI)         += pasemi_nand.o