From: Felix Fietkau Date: Thu, 21 Jun 2007 17:53:08 +0000 (+0000) Subject: minor kernel config sync X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3f0ed5c1a0082a6adde79153d72bc645a0e2e566 minor kernel config sync SVN-Revision: 7690 --- diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default index eae47ce5ab..0ea8e56e8b 100644 --- a/target/linux/adm5120-2.6/config/default +++ b/target/linux/adm5120-2.6/config/default @@ -190,10 +190,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NET_ACT_SIMP=m CONFIG_NET_KEY=y # CONFIG_NET_PCI is not set # CONFIG_NET_PKTGEN is not set diff --git a/target/linux/adm5120eb-2.6/config/default b/target/linux/adm5120eb-2.6/config/default index da6c484cf4..519b83f428 100644 --- a/target/linux/adm5120eb-2.6/config/default +++ b/target/linux/adm5120eb-2.6/config/default @@ -187,10 +187,6 @@ CONFIG_MTD_PHYSMAP_START=0x1fc00000 # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NET_ACT_SIMP=m CONFIG_NET_KEY=y # CONFIG_NET_PCI is not set # CONFIG_NET_PKTGEN is not set diff --git a/target/linux/at91-2.6/config/default b/target/linux/at91-2.6/config/default index 540a038a20..7881ae57ea 100644 --- a/target/linux/at91-2.6/config/default +++ b/target/linux/at91-2.6/config/default @@ -61,7 +61,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_BONDING is not set -# CONFIG_BRIDGE_NETFILTER is not set # CONFIG_BROADCOM_PHY is not set # CONFIG_BSD_DISKLABEL is not set # CONFIG_BSD_PROCESS_ACCT is not set @@ -212,15 +211,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_SPLIT_ROOTFS is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_IND is not set # CONFIG_NET_EMATCH is not set # CONFIG_NET_IPGRE_BROADCAST is not set # CONFIG_NET_PKTGEN is not set diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default index 38e1137c0c..f85b4a1177 100644 --- a/target/linux/brcm47xx-2.6/config/default +++ b/target/linux/brcm47xx-2.6/config/default @@ -13,7 +13,6 @@ CONFIG_BASE_SMALL=0 CONFIG_BCM947XX=y CONFIG_BITREVERSE=y # CONFIG_BONDING is not set -# CONFIG_BRIDGE_NETFILTER is not set # CONFIG_BSD_DISKLABEL is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BT_HCIBCM203X is not set @@ -201,15 +200,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set CONFIG_NETDEV_1000=y -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_IND is not set # CONFIG_NET_EMATCH is not set # CONFIG_NET_IPGRE_BROADCAST is not set # CONFIG_NET_PKTGEN is not set diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22 index 5fac0a48f5..32782f5e91 100644 --- a/target/linux/generic-2.6/config-2.6.22 +++ b/target/linux/generic-2.6/config-2.6.22 @@ -140,7 +140,7 @@ CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_NAT=m CONFIG_BRIDGE_EBT_ULOG=m CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_NETFILTER=y +# CONFIG_BRIDGE_NETFILTER is not set CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BROKEN_ON_SMP=y CONFIG_BSD_DISKLABEL=y diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template index 60f5bae06f..1a88a3ef12 100644 --- a/target/linux/generic-2.6/config-template +++ b/target/linux/generic-2.6/config-template @@ -137,7 +137,7 @@ CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_NAT=m CONFIG_BRIDGE_EBT_ULOG=m CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_NETFILTER=y +# CONFIG_BRIDGE_NETFILTER is not set CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BROKEN_ON_SMP=y CONFIG_BSD_DISKLABEL=y diff --git a/target/linux/iop32x-2.6/config/default b/target/linux/iop32x-2.6/config/default index a066b8e31e..c13255920f 100644 --- a/target/linux/iop32x-2.6/config/default +++ b/target/linux/iop32x-2.6/config/default @@ -262,14 +262,6 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set CONFIG_NETDEV_1000=y -CONFIG_NETFILTER_NETLINK=m -# CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m # CONFIG_NET_CLS_ACT is not set # CONFIG_NET_CLS_IND is not set # CONFIG_NET_EMATCH is not set diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default index c93d82df91..5b29ffa7df 100644 --- a/target/linux/ixp4xx-2.6/config/default +++ b/target/linux/ixp4xx-2.6/config/default @@ -297,14 +297,6 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set # CONFIG_NETDEV_1000 is not set -CONFIG_NETFILTER_NETLINK=m -# CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m # CONFIG_NET_CLS_ACT is not set # CONFIG_NET_CLS_IND is not set # CONFIG_NET_EMATCH is not set diff --git a/target/linux/pxa-2.6/config/default b/target/linux/pxa-2.6/config/default index 43bbc08748..e288e4273b 100644 --- a/target/linux/pxa-2.6/config/default +++ b/target/linux/pxa-2.6/config/default @@ -267,15 +267,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_SHARP_SL is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_XIP is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_IND is not set CONFIG_NET_DIVERT=y # CONFIG_NET_EMATCH is not set # CONFIG_NET_ETHERNET is not set diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default index 57632c012c..c29b715c9b 100644 --- a/target/linux/rdc-2.6/config/default +++ b/target/linux/rdc-2.6/config/default @@ -194,10 +194,6 @@ CONFIG_MTD_RDC3210_SIZE=0x400000 # CONFIG_MWINCHIPC6 is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set -# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NET_ACT_SIMP=m # CONFIG_NET_PKTGEN is not set CONFIG_NET_SCH_FIFO=y # CONFIG_NET_VENDOR_3COM is not set diff --git a/target/linux/sibyte-2.6/config/default b/target/linux/sibyte-2.6/config/default index 8d9895e02e..bf33d13ac6 100644 --- a/target/linux/sibyte-2.6/config/default +++ b/target/linux/sibyte-2.6/config/default @@ -9,7 +9,6 @@ CONFIG_BINFMT_ELF32=y CONFIG_BLK_DEV_RAM_COUNT=16 # CONFIG_BONDING is not set CONFIG_BOOT_ELF32=y -# CONFIG_BRIDGE_NETFILTER is not set # CONFIG_BSD_DISKLABEL is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BT is not set @@ -230,16 +229,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_MATCH_STRING is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_IND is not set # CONFIG_NET_DIVERT is not set # CONFIG_NET_EMATCH is not set # CONFIG_NET_IPGRE_BROADCAST is not set