mtd/drivers/mtd/nand Kconfig,1.37,1.38

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv3837/drivers/mtd/nand

Modified Files:
	Kconfig 
Log Message:

From: Adrian Bunk <bunk at stusta.de>

MTD_NAND=m and MTD_NAND_SHARPSL=y or MTD_NAND_NANDSIM=y are illegal
combinations that mustn't be allowed.

This patch fixes this bug by making MTD_NAND_SHARPSL and MTD_NAND_NANDSIM
tristate's.

Additionally, it fixes some whitespace damage at these options.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Acked-by: Richard Purdie <rpurdie at rpsys.net>
Acked-by: "Artem B. Bityutskiy" <dedekind at yandex.ru>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>



Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/Kconfig,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Kconfig	15 Mar 2006 22:32:08 -0000	1.37
+++ Kconfig	29 Mar 2006 08:30:43 -0000	1.38
@@ -190,11 +190,11 @@
 	  parameter "inftl_bbt_write=1".
 
 config MTD_NAND_SHARPSL
- 	bool "Support for NAND Flash on Sharp SL Series (C7xx + others)"
- 	depends on MTD_NAND	&& ARCH_PXA
+ 	tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
+ 	depends on MTD_NAND && ARCH_PXA
 
 config MTD_NAND_AT91
-	bool "AT91 NAND (Smart Media) support"
+	tristate "AT91 NAND (Smart Media) support"
 	depends on MTD_NAND && ARCH_AT91RM9200
 	help
 	  Enables access to the Smart Media card interface on the AT91RM9200.