Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54af6b46 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] MTD_NAND_SHARPSL and MTD_NAND_NANDSIM should be tristate's 



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: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Acked-by: default avatar"Artem B. Bityutskiy" <dedekind@yandex.ru>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0500abf5

drivers/mtd/nand/Kconfig

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



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



config MTD_NAND_NANDSIM

 	bool "Support for NAND Flash Simulator"

	tristate "Support for NAND Flash Simulator"

	depends on MTD_NAND && MTD_PARTITIONS



	help

	  The simulator may simulate verious NAND flash chips for the

	  MTD nand layer.