commit 57fce0f17f497583266a26328690f40f33af08c5
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Mon Dec 15 15:21:15 2008 +0100
UML: Enable MTD, by moving the dependency on HAS_IOMEM
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
@@ -28,9 +28,7 @@ source "drivers/scsi/Kconfig"
source "drivers/md/Kconfig"
-if BROKEN
- source "drivers/mtd/Kconfig"
-endif
+source "drivers/mtd/Kconfig"
source "drivers/leds/Kconfig"
@@ -1,6 +1,5 @@
menuconfig MTD
tristate "Memory Technology Device (MTD) support"
- depends on HAS_IOMEM
help
Memory Technology Devices are flash, RAM and similar chips, often
used for solid state file systems on embedded devices. This option
@@ -315,15 +314,17 @@ config MTD_OOPS
To use, add console=ttyMTDx to the kernel command line,
where x is the MTD device number to use.
-source "drivers/mtd/chips/Kconfig"
-
-source "drivers/mtd/maps/Kconfig"
+if HAS_IOMEM
+ source "drivers/mtd/chips/Kconfig"
+ source "drivers/mtd/maps/Kconfig"
+endif
source "drivers/mtd/devices/Kconfig"
-source "drivers/mtd/nand/Kconfig"
-
-source "drivers/mtd/onenand/Kconfig"
+if HAS_IOMEM
+ source "drivers/mtd/nand/Kconfig"
+ source "drivers/mtd/onenand/Kconfig"
+endif
source "drivers/mtd/lpddr/Kconfig"
@@ -29,6 +29,7 @@ obj-$(CONFIG_MTD_OOPS) += mtdoops.o
nftl-objs := nftlcore.o nftlmount.o
inftl-objs := inftlcore.o inftlmount.o
-obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
+obj-y += devices/ tests/
+obj-$(CONFIG_HAS_IOMEM) += chips/ lpddr/ maps/ nand/ onenand/
obj-$(CONFIG_MTD_UBI) += ubi/
@@ -106,6 +106,7 @@ config M25PXX_USE_FAST_READ
config MTD_SLRAM
tristate "Uncached system RAM"
+ depends on HAS_IOMEM
help
If your CPU cannot cache all of the physical memory in your machine,
you can still use it for storage or swap by using this driver to
@@ -113,6 +114,7 @@ config MTD_SLRAM
config MTD_PHRAM
tristate "Physical system RAM"
+ depends on HAS_IOMEM
help
This is a re-implementation of the slram driver above.
@@ -179,6 +181,7 @@ config MTD_BLOCK2MTD
Testing MTD users (eg JFFS2) on large media and media that might
be removed during a write (using the floppy drive).
+if HAS_IOMEM
comment "Disk-On-Chip Device Drivers"
config MTD_DOC2000
@@ -297,5 +300,6 @@ config MTD_DOCPROBE_55AA
LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
you have managed to wipe the first block.
+endif
endmenu