Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

1 files changed, 53 insertions, 4 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index cfe288a6e853..3db77eec0ed2 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -23,6 +23,14 @@ config MTD_NAND_VERIFY_WRITE
           device thinks the write was successful, a bit could have been
           flipped accidentaly due to device wear or something else.
 
+config MTD_NAND_ECC_SMC
+        bool "NAND ECC Smart Media byte order"
+        depends on MTD_NAND
+        default n
+        help
+          Software ECC according to the Smart Media Specification.
+          The original Linux implementation had byte 0 and 1 swapped.
+
 config MTD_NAND_AUTCPU12
         tristate "SmartMediaCard on autronix autcpu12 board"
         depends on MTD_NAND && ARCH_AUTCPU12
@@ -49,12 +57,24 @@ config MTD_NAND_SPIA
         help
           If you had to ask, you don't have one. Say 'N'.
 
+config MTD_NAND_AMS_DELTA
+        tristate "NAND Flash device on Amstrad E3"
+        depends on MACH_AMS_DELTA && MTD_NAND
+        help
+          Support for NAND flash on Amstrad E3 (Delta).
+
 config MTD_NAND_TOTO
         tristate "NAND Flash device on TOTO board"
-        depends on ARCH_OMAP && MTD_NAND
+        depends on ARCH_OMAP && MTD_NAND && 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 && MTD_NAND
+        help
+          Support for NAND flash on Technologic Systems TS-7250 platform.
+
 config MTD_NAND_IDS
         tristate
 
@@ -76,7 +96,7 @@ config MTD_NAND_RTC_FROM4
 
 config MTD_NAND_PPCHAMELEONEVB
         tristate "NAND Flash device on PPChameleonEVB board"
-        depends on PPCHAMELEONEVB && MTD_NAND
+        depends on PPCHAMELEONEVB && MTD_NAND && BROKEN
         help
           This enables the NAND flash driver on the PPChameleon EVB Board.
 
@@ -87,7 +107,7 @@ config MTD_NAND_S3C2410
           This enables the NAND flash controller on the S3C2410 and S3C2440
           SoCs
 
-          No board specfic support is done by this driver, each board
+          No board specific support is done by this driver, each board
           must advertise a platform_device for the driver to attach.
 
 config MTD_NAND_S3C2410_DEBUG
@@ -109,6 +129,22 @@ config MTD_NAND_S3C2410_HWECC
           currently not be able to switch to software, as there is no
           implementation for ECC method used by the S3C2410
 
+config MTD_NAND_NDFC
+        tristate "NDFC NanD Flash Controller"
+        depends on MTD_NAND && 44x
+        help
+         NDFC Nand Flash Controllers are integrated in EP44x SoCs
+
+config MTD_NAND_S3C2410_CLKSTOP
+        bool "S3C2410 NAND IDLE clock stop"
+        depends on MTD_NAND_S3C2410
+        default n
+        help
+          Stop the clock to the NAND controller when there is no chip
+          selected to save power. This will mean there is a small delay
+          when the is NAND chip selected or released, but will save
+          approximately 5mA of power when there is nothing happening.
+
 config MTD_NAND_DISKONCHIP
         tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
         depends on MTD_NAND && EXPERIMENTAL
@@ -183,11 +219,24 @@ config MTD_NAND_SHARPSL
         tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
         depends on MTD_NAND && ARCH_PXA
 
+config MTD_NAND_CS553X
+        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
+        depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)
+        help
+          The CS553x companion chips for the AMD Geode processor
+          include NAND flash controllers with built-in hardware ECC
+          capabilities; enabling this option will allow you to use
+          these. The driver will check the MSRs to verify that the
+          controller is enabled for NAND, and currently requires that
+          the controller be in MMIO mode.
+
+          If you say "m", the module will be called "cs553x_nand.ko".
+
 config MTD_NAND_NANDSIM
         tristate "Support for NAND Flash Simulator"
         depends on MTD_NAND && MTD_PARTITIONS
         help
-          The simulator may simulate verious NAND flash chips for the
+          The simulator may simulate various NAND flash chips for the
           MTD nand layer.
 
 endmenu