[kernel] remove netfilter_upstream_fixes patches, not needed anymore after kernel...

[openwrt.git] / target / linux / generic-2.6 / config-2.6.29

diff --git a/target/linux/generic-2.6/config-2.6.29 b/target/linux/generic-2.6/config-2.6.29
index a33ecc1..2cd00a1 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.29
+++ b/target/linux/generic-2.6/config-2.6.29
@@ -870,6 +870,7 @@ CONFIG_LOCKD_V4=y
 # CONFIG_LOGITECH_FF is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_LXT_PHY is not set
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_DEBUG is not set
@@ -952,6 +953,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET=y