Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: 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>

authored by

Adrian Bunk and committed by
Linus Torvalds
54af6b46 0500abf5

+8 -9
+8 -9
drivers/mtd/nand/Kconfig
··· 178 178 Even if you leave this disabled, you can enable BBT writes at module 179 179 load time (assuming you build diskonchip as a module) with the module 180 180 parameter "inftl_bbt_write=1". 181 - 182 - config MTD_NAND_SHARPSL 183 - bool "Support for NAND Flash on Sharp SL Series (C7xx + others)" 184 - depends on MTD_NAND && ARCH_PXA 185 - 186 - config MTD_NAND_NANDSIM 187 - bool "Support for NAND Flash Simulator" 188 - depends on MTD_NAND && MTD_PARTITIONS 189 181 182 + config MTD_NAND_SHARPSL 183 + tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" 184 + depends on MTD_NAND && ARCH_PXA 185 + 186 + config MTD_NAND_NANDSIM 187 + tristate "Support for NAND Flash Simulator" 188 + depends on MTD_NAND && MTD_PARTITIONS 190 189 help 191 190 The simulator may simulate verious NAND flash chips for the 192 191 MTD nand layer. 193 - 192 + 194 193 endmenu