Updated to new upstream release (v1.3.16)

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

diff --git a/target/linux/linux-2.4/config/brcm b/target/linux/linux-2.4/config/brcm
index 41bde3d..6afe1bb 100644 (file)
--- a/target/linux/linux-2.4/config/brcm
+++ b/target/linux/linux-2.4/config/brcm
@@ -363,14 +363,13 @@ CONFIG_IP_NF_MATCH_LENGTH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TCPMSS=y
 CONFIG_IP_NF_MATCH_HELPER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TCPMSS=y
 CONFIG_IP_NF_MATCH_HELPER=m

-CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_STATE=y

 CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_LAYER7=m
 # CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
 CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN=2048
 CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_LAYER7=m
 # CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
 CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN=2048

-# CONFIG_IP_NF_MATCH_PHYSDEV is not set

 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_MIRROR=m
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_MIRROR=m


@@ -378,6 +377,7 @@ CONFIG_IP_NF_NAT=y
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_REDIRECT=m

+CONFIG_IP_NF_TARGET_NETMAP=m

 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_NAT_AMANDA=m


@@ -438,26 +438,6 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=y
 # CONFIG_ATALK is not set
 # CONFIG_DECNET 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_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_LLC is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_LLC is not set


@@ -857,7 +837,7 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=128
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_UNIX98_PTY_COUNT=128
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set

-# CONFIG_PPDEV is not set
+CONFIG_PPDEV=m

 # CONFIG_TIPAR is not set
 
 #
 # CONFIG_TIPAR is not set
 
 #


@@ -1112,7 +1092,6 @@ CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set
 CONFIG_USB_OHCI=m
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set

-# CONFIG_USB_BLUETOOTH is not set

 # CONFIG_USB_MIDI is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_MIDI is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set


@@ -1124,7 +1103,7 @@ CONFIG_USB_STORAGE_HP8200e=y
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y

-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m

 CONFIG_USB_PRINTER=m
 # CONFIG_USB_HID is not set
 # CONFIG_USB_HIDINPUT is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_HID is not set
 # CONFIG_USB_HIDINPUT is not set


@@ -1166,7 +1145,30 @@ CONFIG_USB_PRINTER=m
 #
 # Bluetooth support
 #
 #
 # Bluetooth support
 #

-# CONFIG_BLUEZ is not set
+CONFIG_BLUEZ=m
+CONFIG_BLUEZ_L2CAP=m
+CONFIG_BLUEZ_SCO=m
+CONFIG_BLUEZ_RFCOMM=m
+CONFIG_BLUEZ_RFCOMM_TTY=y
+CONFIG_BLUEZ_BNEP=m
+CONFIG_BLUEZ_BNEP_MC_FILTER=y
+CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BLUEZ_HCIUSB=m
+CONFIG_BLUEZ_HCIUSB_SCO=y
+CONFIG_BLUEZ_HCIUART=m
+CONFIG_BLUEZ_HCIUART_H4=y
+CONFIG_BLUEZ_HCIUART_BCSP=y
+CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+# CONFIG_BLUEZ_HCIBFUSB is not set
+# CONFIG_BLUEZ_HCIDTL1 is not set
+# CONFIG_BLUEZ_HCIBT3C is not set
+# CONFIG_BLUEZ_HCIBLUECARD is not set
+# CONFIG_BLUEZ_HCIBTUART is not set
+# CONFIG_BLUEZ_HCIVHCI is not set

 
 #
 # Kernel hacking
 
 #
 # Kernel hacking