[PATCH] MTD_NAND_SHARPSL and MTD_NAND_NANDSIM should be tristate's (54af6b46) · Commits · 戴 / test

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@stusta.de> Acked-by:

Richard Purdie <rpurdie@rpsys.net> Acked-by:

"Artem B. Bityutskiy" <dedekind@yandex.ru> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by:

David Woodhouse <dwmw2@infradead.org> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

drivers/mtd/nand/Kconfig

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -180,13 +180,12 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
	parameter "inftl_bbt_write=1".		parameter "inftl_bbt_write=1".

	config MTD_NAND_SHARPSL		config MTD_NAND_SHARPSL
	bool "Support for NAND Flash on Sharp SL Series (C7xx + others)"		tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
	depends on MTD_NAND && ARCH_PXA		depends on MTD_NAND && ARCH_PXA

	config MTD_NAND_NANDSIM		config MTD_NAND_NANDSIM
	bool "Support for NAND Flash Simulator"		tristate "Support for NAND Flash Simulator"
	depends on MTD_NAND && MTD_PARTITIONS		depends on MTD_NAND && MTD_PARTITIONS

	help		help
	The simulator may simulate verious NAND flash chips for the		The simulator may simulate verious NAND flash chips for the
	MTD nand layer.		MTD nand layer.

Admin message