upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 7833587..8480057 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/maps/Kconfig
-# $Id: Kconfig,v 1.37 2004/10/20 22:57:18 dwmw2 Exp $
+# $Id: Kconfig,v 1.42 2005/01/05 16:59:50 dwmw2 Exp $
 
 menu "Mapping drivers for chip access"
        depends on MTD!=n
@@ -159,7 +159,7 @@ config MTD_VMAX
 
 config MTD_SCx200_DOCFLASH
        tristate "Flash device mapped with DOCCS on NatSemi SCx200"
-       depends on X86 && MTD_CFI
+       depends on SCx200 && MTD_CFI && MTD_PARTITIONS
        help
          Enable support for a flash chip mapped using the DOCCS signal on a
          National Semiconductor SCx200 processor.
@@ -354,7 +354,7 @@ config MTD_CFI_FLAGADM
        tristate "CFI Flash device mapping on FlagaDM"
        depends on PPC32 && 8xx && MTD_CFI
        help
-         Mapping for the Flaga digital module. If you don´t have one, ignore
+         Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
 
 config MTD_BEECH
@@ -373,9 +373,17 @@ config MTD_ARCTIC
          Arctic board. If you have one of these boards and would like to
          use the flash chips on it, say 'Y'.
 
+config MTD_WALNUT
+       tristate "Flash device mapped on IBM 405GP Walnut"
+       depends on MTD_JEDECPROBE && PPC32 && 40x && WALNUT
+       help
+         This enables access routines for the flash chips on the IBM 405GP
+         Walnut board. If you have one of these boards and would like to
+         use the flash chips on it, say 'Y'.
+
 config MTD_EBONY
        tristate "Flash devices mapped on IBM 440GP Ebony"
-       depends on MTD_CFI && PPC32 && 44x && EBONY
+       depends on MTD_JEDECPROBE && PPC32 && 44x && EBONY
        help
          This enables access routines for the flash chips on the IBM 440GP
          Ebony board. If you have one of these boards and would like to
@@ -401,7 +409,7 @@ config MTD_CSTM_MIPS_IXX
        tristate "Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board"
        depends on MIPS && MTD_CFI && MTD_JEDECPROBE && MTD_PARTITIONS
        help
-         This provides a mapping driver for the Integrated Tecnology
+         This provides a mapping driver for the Integrated Technology
          Express, Inc (ITE) QED-4N-S01B eval board and the Globespan IVR
          Reference Board. It provides the necessary addressing, length,
          buswidth, vpp code and addition setup of the flash device for
@@ -645,5 +653,11 @@ config MTD_BAST_MAXSIZE
        depends on MTD_BAST
        default "4"
 
+config MTD_SHARP_SL
+       bool "ROM maped on Sharp SL Series"
+       depends on MTD && ARCH_PXA
+       help
+         This enables access to the flash chip on the Sharp SL Series of PDAs.
+
 endmenu