2 files changed, 20 insertions, 7 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 291660abe3a6..26f75c299440 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -164,9 +164,15 @@ config MTD_CHAR
           memory chips, and also use ioctl() to obtain information about
           the device, or to erase parts of it.
 
+config MTD_BLKDEVS
+        tristate "Common interface to block layer for MTD 'translation layers'"
+        depends on MTD && BLOCK
+        default n
+
 config MTD_BLOCK
         tristate "Caching block device access to MTD devices"
         depends on MTD && BLOCK
+        select MTD_BLKDEVS
         ---help---
           Although most flash chips have an erase size too large to be useful
           as block devices, it is possible to use MTD devices which are based
@@ -189,6 +195,7 @@ config MTD_BLOCK
 config MTD_BLOCK_RO
         tristate "Readonly block device access to MTD devices"
         depends on MTD_BLOCK!=y && MTD && BLOCK
+        select MTD_BLKDEVS
         help
           This allows you to mount read-only file systems (such as cramfs)
           from an MTD device, without the overhead (and danger) of the caching
@@ -200,6 +207,7 @@ config MTD_BLOCK_RO
 config FTL
         tristate "FTL (Flash Translation Layer) support"
         depends on MTD && BLOCK
+        select MTD_BLKDEVS
         ---help---
           This provides support for the original Flash Translation Layer which
           is part of the PCMCIA specification. It uses a kind of pseudo-
@@ -216,6 +224,7 @@ config FTL
 config NFTL
         tristate "NFTL (NAND Flash Translation Layer) support"
         depends on MTD && BLOCK
+        select MTD_BLKDEVS
         ---help---
           This provides support for the NAND Flash Translation Layer which is
           used on M-Systems' DiskOnChip devices. It uses a kind of pseudo-
@@ -239,6 +248,7 @@ config NFTL_RW
 config INFTL
         tristate "INFTL (Inverse NAND Flash Translation Layer) support"
         depends on MTD && BLOCK
+        select MTD_BLKDEVS
         ---help---
           This provides support for the Inverse NAND Flash Translation
           Layer which is used on M-Systems' newer DiskOnChip devices. It
@@ -256,6 +266,7 @@ config INFTL
 config RFD_FTL
         tristate "Resident Flash Disk (Flash Translation Layer) support"
         depends on MTD && BLOCK
+        select MTD_BLKDEVS
         ---help---
           This provides support for the flash translation layer known
           as the Resident Flash Disk (RFD), as used by the Embedded BIOS
@@ -266,6 +277,7 @@ config RFD_FTL
 config SSFDC
         tristate "NAND SSFDC (SmartMedia) read only translation layer"
         depends on MTD && BLOCK
+        select MTD_BLKDEVS
         help
           This enables read only access to SmartMedia formatted NAND
           flash. You can mount it with FAT file system.
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 1e36b9aed98b..c130e6261adf 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -15,13 +15,14 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
 
 # 'Users' - code which presents functionality to userspace.
 obj-$(CONFIG_MTD_CHAR)          += mtdchar.o
-obj-$(CONFIG_MTD_BLOCK)         += mtdblock.o mtd_blkdevs.o
-obj-$(CONFIG_MTD_BLOCK_RO)      += mtdblock_ro.o mtd_blkdevs.o
-obj-$(CONFIG_FTL)               += ftl.o mtd_blkdevs.o
-obj-$(CONFIG_NFTL)              += nftl.o mtd_blkdevs.o
-obj-$(CONFIG_INFTL)             += inftl.o mtd_blkdevs.o
-obj-$(CONFIG_RFD_FTL)           += rfd_ftl.o mtd_blkdevs.o
-obj-$(CONFIG_SSFDC)             += ssfdc.o mtd_blkdevs.o
+obj-$(CONFIG_MTD_BLKDEVS)       += mtd_blkdevs.o
+obj-$(CONFIG_MTD_BLOCK)         += mtdblock.o
+obj-$(CONFIG_MTD_BLOCK_RO)      += mtdblock_ro.o
+obj-$(CONFIG_FTL)               += ftl.o
+obj-$(CONFIG_NFTL)              += nftl.o
+obj-$(CONFIG_INFTL)             += inftl.o
+obj-$(CONFIG_RFD_FTL)           += rfd_ftl.o
+obj-$(CONFIG_SSFDC)             += ssfdc.o
 
 nftl-objs               := nftlcore.o nftlmount.o
 inftl-objs              := inftlcore.o inftlmount.o