aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-05 18:40:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-05 18:40:45 +0000
commit18857b1c7ea39b95f7675902fea59a78fae8fe6c (patch)
treea8ea63b9bba20c84d30139457fe6484f88054014
parent36832dd0b631b6c22275e8b9aa3d44283ee932e7 (diff)
downloadupstream-18857b1c7ea39b95f7675902fea59a78fae8fe6c.tar.gz
upstream-18857b1c7ea39b95f7675902fea59a78fae8fe6c.tar.bz2
upstream-18857b1c7ea39b95f7675902fea59a78fae8fe6c.zip
[ar71xx] sync kernel config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15628 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/config-2.6.281
-rw-r--r--target/linux/ar71xx/config-2.6.291
-rw-r--r--target/linux/ar71xx/config-2.6.301
3 files changed, 1 insertions, 2 deletions
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