backport acx100 2.6.24 fixes from SVN

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

diff --git a/target/linux/adm5120/router_le/config-2.6.23 b/target/linux/adm5120/router_le/config-2.6.23
index b7b2aa0..f84dc99 100644 (file)
--- 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
@@ -175,7 +173,6 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
-CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_VENDOR_3COM is not set
@@ -196,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