backport acx100 2.6.24 fixes from SVN

[openwrt.git] / target / linux / adm5120 / router_be / config-2.6.23

diff --git a/target/linux/adm5120/router_be/config-2.6.23 b/target/linux/adm5120/router_be/config-2.6.23
index 5db6c06..3ff67e4 100644 (file)
--- 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_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
 # 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_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
 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_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
 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_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
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SERIAL_ADM5120 is not set
 CONFIG_SERIAL_AMBA_PL010=y