aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-25 14:24:58 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-25 14:24:58 +0000
commitaa196516d5d51cef19f4ccd5f8c68c028b14eb8f (patch)
tree850d9c7cbb142f6e5881ff6637728608a63bda24
parent7859cab35ce1ba26fa785ba598dde8bd88c6f50a (diff)
downloadupstream-aa196516d5d51cef19f4ccd5f8c68c028b14eb8f.tar.gz
upstream-aa196516d5d51cef19f4ccd5f8c68c028b14eb8f.tar.bz2
upstream-aa196516d5d51cef19f4ccd5f8c68c028b14eb8f.zip
ar71xx: sync kernel configs
SVN-Revision: 19328
-rw-r--r--target/linux/ar71xx/config-2.6.313
-rw-r--r--target/linux/ar71xx/config-2.6.322
2 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 9cdfa01879..3b8529b222 100644
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -105,7 +105,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_GPIOLIB=y
-# CONFIG_GPIO_NXP_74HC153 is not set
CONFIG_GPIO_NXP_74HC153=y
CONFIG_GPIO_SYSFS=y
CONFIG_HARDWARE_WATCHPOINTS=y
@@ -188,9 +187,9 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366_SMI=y
CONFIG_RTL8366S_PHY=y
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+CONFIG_RTL8366_SMI=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32
index 002e4a9357..192daa65e4 100644
--- a/target/linux/ar71xx/config-2.6.32
+++ b/target/linux/ar71xx/config-2.6.32
@@ -191,9 +191,9 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366_SMI=y
CONFIG_RTL8366S_PHY=y
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+CONFIG_RTL8366_SMI=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set