From: Adrian Bunk 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 Acked-by: Richard Purdie Acked-by: "Artem B. Bityutskiy" Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- drivers/mtd/nand/Kconfig | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff -puN drivers/mtd/nand/Kconfig~mtd_nand_sharpsl-and-mtd_nand_nandsim-should-be-tristates drivers/mtd/nand/Kconfig --- devel/drivers/mtd/nand/Kconfig~mtd_nand_sharpsl-and-mtd_nand_nandsim-should-be-tristates 2006-01-22 23:38:51.000000000 -0800 +++ devel-akpm/drivers/mtd/nand/Kconfig 2006-01-22 23:38:51.000000000 -0800 @@ -178,17 +178,16 @@ config MTD_NAND_DISKONCHIP_BBTWRITE Even if you leave this disabled, you can enable BBT writes at module load time (assuming you build diskonchip as a module) with the module 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 - - config MTD_NAND_NANDSIM - bool "Support for NAND Flash Simulator" - depends on MTD_NAND && MTD_PARTITIONS +config MTD_NAND_SHARPSL + tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" + depends on MTD_NAND && ARCH_PXA + +config MTD_NAND_NANDSIM + 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. - + endmenu _