[2.6 patch] MTD_NAND_SHARPSL and MTD_NAND_NANDSIM must be tristate's

[Adrian Bunk]

On Wed, Dec 28, 2005 at 12:39:54AM -0500, Miles Lane wrote:

>   LD      .tmp_vmlinux1
> drivers/built-in.o: In function
> `init_nandsim':nandsim.c:(.text+0x88ba2): undefined reference to
> `nand_flash_ids'
> drivers/built-in.o: In function
> `ns_init_module':nandsim.c:(.init.text+0x7b72): undefined reference to
> `nand_scan'
> :nandsim.c:(.init.text+0x7bb5): undefined reference to `nand_default_bbt'
> drivers/built-in.o: In function
> `ns_cleanup_module':nandsim.c:(.exit.text+0x37b): undefined reference
> to `nand_release'
> make: *** [.tmp_vmlinux1] Error 1
>...

Thanks for your report, a fix is below.

cu
Adrian


<--  snip  -->


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@xxxxxxxxx>

--- linux-git/drivers/mtd/nand/Kconfig.old	2005-12-31 12:20:12.000000000 +0100
+++ linux-git/drivers/mtd/nand/Kconfig	2005-12-31 12:21:35.000000000 +0100
@@ -178,17 +178,16 @@
 	  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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/