aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-01-16 18:07:33 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-01-16 18:07:33 +0000
commit351ca63dbf79eb55195719e976df4ac4ef667d3c (patch)
treebee44b3752afcff9cf60b9f28bd7e77cb8f282cd /target/linux
parent7ef96948af783382df4705b9db51d716d28c9aeb (diff)
downloadupstream-351ca63dbf79eb55195719e976df4ac4ef667d3c.tar.gz
upstream-351ca63dbf79eb55195719e976df4ac4ef667d3c.tar.bz2
upstream-351ca63dbf79eb55195719e976df4ac4ef667d3c.zip
sync kernel config
SVN-Revision: 10214
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/adm5120/router_be/config-2.6.235
-rw-r--r--target/linux/adm5120/router_le/config-2.6.233
2 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/adm5120/router_be/config-2.6.23 b/target/linux/adm5120/router_be/config-2.6.23
index 5db6c06f57..3ff67e4595 100644
--- a/target/linux/adm5120/router_be/config-2.6.23
+++ b/target/linux/adm5120/router_be/config-2.6.23
@@ -1,6 +1,7 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
CONFIG_ADM5120_CPU_OVERRIDES=y
+CONFIG_ADM5120_WDT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
@@ -66,8 +67,6 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HID=m
CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
CONFIG_HZ=250
@@ -91,6 +90,7 @@ CONFIG_IRQ_CPU=y
CONFIG_LEDS_ADM5120=m
# CONFIG_LEDS_ADM5120_DIAG is not set
# CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set
+# CONFIG_LEDS_ALIX is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
CONFIG_LEGACY_PTYS=y
@@ -183,7 +183,6 @@ CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SERIAL_8250 is not set
# CONFIG_SERIAL_ADM5120 is not set
CONFIG_SERIAL_AMBA_PL010=y
diff --git a/target/linux/adm5120/router_le/config-2.6.23 b/target/linux/adm5120/router_le/config-2.6.23
index 982e02b632..f84dc99c14 100644
--- a/target/linux/adm5120/router_le/config-2.6.23
+++ b/target/linux/adm5120/router_le/config-2.6.23
@@ -67,8 +67,6 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HID=m
CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
CONFIG_HZ=250
@@ -195,7 +193,6 @@ CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SERIAL_8250 is not set
# CONFIG_SERIAL_ADM5120 is not set
CONFIG_SERIAL_AMBA_PL010=y