ssb: sync with wireless-2.6

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

diff --git a/target/linux/brcm-2.4/config-default b/target/linux/brcm-2.4/config-default
index 390a7d1..ca963df 100644 (file)
--- a/target/linux/brcm-2.4/config-default
+++ b/target/linux/brcm-2.4/config-default
@@ -100,25 +100,6 @@ CONFIG_BLUEZ_RFCOMM=m
 CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_SCO=m
 # CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARPF is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IPF is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARKF is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_VLANF is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_CARDBUS=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
 # CONFIG_CMDLINE_BOOL is not set
@@ -164,22 +145,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
-CONFIG_IP6_NF_MATCH_LIMIT=m
-# CONFIG_IP_NF_MATCH_PHYSDEV is not set
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_NQ=m
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_TAB_BITS=12
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_WRR=m
+# CONFIG_IP_VS is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_LNE390 is not set
 CONFIG_LOG_BUF_SHIFT=0
@@ -194,6 +160,7 @@ CONFIG_MKISS=m
 CONFIG_MSDOS_FS=m
 CONFIG_MTD_BCM947XX=y
 CONFIG_MTD_CFI_SSTSTD=y
+CONFIG_MTD_CFI_B1=y
 CONFIG_MTD_SFLASH=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
@@ -205,7 +172,6 @@ CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_WIRELESS=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
-CONFIG_NLS=y
 CONFIG_PARPORT=m
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PARPORT_AMIGA is not set
@@ -362,6 +328,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
 CONFIG_USB_SERIAL_VISOR=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set