[kernel] refresh generic 2.6.23 patches

[openwrt.git] / target / linux / generic-2.4 / config-default

diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
index 017bfd0..c5c411d 100644 (file)
--- a/target/linux/generic-2.4/config-default
+++ b/target/linux/generic-2.4/config-default
@@ -47,26 +47,6 @@ CONFIG_BLK_DEV_SD=m
 # CONFIG_BLK_STATS is not set
 # CONFIG_BONDING is not set
 CONFIG_BRIDGE=y
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_IPF=m
-CONFIG_BRIDGE_EBT_ARPF=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_VLANF=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_MARKF=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BUILD_ELF64 is not set
@@ -218,6 +198,7 @@ CONFIG_IP6_NF_MATCH_RANDOM=m
 CONFIG_IP6_NF_TARGET_IMQ=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_MARK=m
+CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IPMI_DEVICE_INTERFACE is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMI_KCS is not set
@@ -261,7 +242,6 @@ CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_MARK=m
 CONFIG_IP_NF_MATCH_MULTIPORT=y
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
 # CONFIG_IP_NF_MATCH_QUOTA is not set
 CONFIG_IP_NF_MATCH_RANDOM=m
@@ -531,7 +511,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_NFTL is not set
 # CONFIG_NINO is not set
-CONFIG_NLS=m
+CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_1250=m
 # CONFIG_NLS_CODEPAGE_1251 is not set
 CONFIG_NLS_CODEPAGE_437=m
@@ -693,6 +673,8 @@ CONFIG_SERIAL_CONSOLE=y
 CONFIG_SHAPER=m
 # CONFIG_SIBYTE_SB1xxx_SOC is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
 # CONFIG_SLIP is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS is not set
@@ -730,6 +712,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=128
 # CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_GADGET is not set
 CONFIG_USB_USBNET=m
 CONFIG_VFAT_FS=m
@@ -743,6 +726,7 @@ CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_WAVELAN is not set
+# CONFIG_WDT_W83627 is not set
 # CONFIG_X25 is not set
 # CONFIG_XFS_DEBUG is not set
 CONFIG_XFS_FS=m