Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 91544c2..7a58bd5 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -284,13 +284,6 @@ config MTD_L440GX
 
          BE VERY CAREFUL.
 
-config MTD_SBC8240
-       tristate "Flash device on SBC8240"
-       depends on MTD_JEDECPROBE && 8260
-       help
-          Flash access on the SBC8240 board from Wind River.  See
-          <http://www.windriver.com/products/sbc8240/>
-
 config MTD_TQM8XXL
        tristate "CFI Flash device mapped on TQM8XXL"
        depends on MTD_CFI && TQM8xxL
@@ -492,7 +485,7 @@ config MTD_BFIN_ASYNC
          If compiled as a module, it will be called bfin-async-flash.
 
 config MTD_UCLINUX
-       tristate "Generic uClinux RAM/ROM filesystem support"
+       bool "Generic uClinux RAM/ROM filesystem support"
        depends on MTD_PARTITIONS && MTD_RAM && !MMU
        help
          Map driver to support image based filesystems for uClinux.