IKCONFIG shouldn't be enabled by default

[openwrt.git] / target / linux / ar71xx / config-2.6.28

diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index f272070..ef908ea 100644 (file)
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -121,9 +121,10 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set

+CONFIG_MTD_AR91XX_FLASH=y

 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_CFI is not set

-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_JEDECPROBE=y

 CONFIG_MTD_M25P80=y
 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y


@@ -177,11 +178,13 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SPI=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 CONFIG_SPI=y

+CONFIG_SPI_AP83=y

 CONFIG_SPI_AR71XX=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_AR71XX=y
 CONFIG_SPI_BITBANG=y

-# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_GPIO=y

 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set

+# CONFIG_SPI_VSC7385 is not set

 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y