add back the base-files/image code from brcm-2.4 to brcm47xx

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / config-2.6.32

diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index 3b08e2fc570742e890f167eb35b482765e3d6548..3cd83c2b1c757871c1fad338a8a1d9120a137a01 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -656,7 +656,7 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_CAPI is not set 
+# CONFIG_GIGASET_CAPI is not set
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIO_BT8XX is not set
@@ -920,7 +920,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP1000 is not set
-# CONFIG_IP175C_PHY is not set
+# CONFIG_IP17XX_PHY is not set
 # CONFIG_IP6_NF_FILTER is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP6_NF_MANGLE is not set
@@ -1433,6 +1433,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_MATCH_STATE is not set
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
 # CONFIG_NETFILTER_XT_MATCH_TIME is not set
 # CONFIG_NETFILTER_XT_MATCH_U32 is not set
@@ -1449,6 +1450,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER=y
 CONFIG_NET_IPGRE_BROADCAST=y
@@ -1714,6 +1716,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCMCIA_SYM53C500 is not set
 # CONFIG_PCMCIA_WAVELAN is not set
 # CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRCOM is not set
 # CONFIG_PCNET32 is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 # CONFIG_PD6729 is not set