From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 5 May 2009 18:40:45 +0000 (+0000)
Subject: sync kernel config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=744a09fa4bb2506f0169b99a1a7af2519ab7c14c;p=openwrt%2Fstaging%2Flinusw.git

sync kernel config

SVN-Revision: 15628
---

diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index a7e5572af1..ca0c9a06a9 100644
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -191,7 +191,6 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO_OLD is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
-# CONFIG_SSB_DRIVER_MIPS is not set
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
diff --git a/target/linux/ar71xx/config-2.6.29 b/target/linux/ar71xx/config-2.6.29
index b73b88f1cb..ab7312e3c2 100644
--- a/target/linux/ar71xx/config-2.6.29
+++ b/target/linux/ar71xx/config-2.6.29
@@ -198,7 +198,6 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO_OLD is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
-# CONFIG_SSB_DRIVER_MIPS is not set
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index 345c919e41..c093a220fe 100644
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -138,6 +138,7 @@ CONFIG_MIPS_MT_DISABLED=y
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_RB4XX=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y