mtd: Make SM_FTL depend on MTD_NAND

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=7de6f798e13093536b6cb229213db2fab6e6555f
Commit:     7de6f798e13093536b6cb229213db2fab6e6555f
Parent:     1f6ca0d6213278f8608c7e342e423ec0c0198040
Author:     David Woodhouse <David.Woodhouse at intel.com>
AuthorDate: Mon Mar 8 18:45:00 2010 -0800
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Mar 8 18:45:06 2010 -0800

    mtd: Make SM_FTL depend on MTD_NAND
    
    Randy Dunlap observed a build problem with the following config:
    
    CONFIG_SM_FTL=y
    CONFIG_SM_FTL_MUSEUM=y
    
    CONFIG_MTD_NAND=m
    
    The ECC calculation routines are then built as a module, but referenced
    by the sm_ftl code in the kernel, resulting in a build failure. The
    simple fix is to make CONFIG_SM_FTL depend on MTD_NAND unconditionally
    -- it's pointless without hardware support anyway.
    
    Fix some typos which Randy pointed out, too.
    
    Reported-By: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/Kconfig |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 8a91240..dbee14d 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -307,22 +307,22 @@ config SSFDC
 
 config SM_FTL
 	tristate "SmartMedia/xD new translation layer"
-	depends on EXPERIMENTAL && BLOCK
+	depends on EXPERIMENTAL && BLOCK && MTD_NAND
 	select MTD_BLKDEVS
 	help
 	  This enables new and very EXPERMENTAL support for SmartMedia/xD
-	  FTL (Flash tanslation layer)
+	  FTL (Flash translation layer).
 	  Write support isn't yet well tested, therefore this code IS likely to
 	  eat your card, so please don't use it together with valuable data.
 	  Use readonly driver (CONFIG_SSFDC) instead.
 
 config SM_FTL_MUSEUM
 	boolean "Additional Support for 1MiB and 2MiB SmartMedia cards"
-	depends on SM_FTL && MTD_NAND
+	depends on SM_FTL
 	select MTD_NAND_ECC_SMC
 	help
-	  Very old SmartMedia cards need ECC to be calculated in the FTL
-	  Such cards are very rare, thus enabling this option is mostly useless
+	  Very old SmartMedia cards need ECC to be calculated in the FTL.
+	  Such cards are very rare, thus enabling this option is mostly useless.
 	  Also this support is completely UNTESTED.
 
 config MTD_OOPS