summaryrefslogtreecommitdiff
path: root/packages/linux/unslung-kernel/defconfig
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-11-11 18:22:30 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-11-11 18:22:30 +0000
commit4eb54f079356de0e82ff98cfc68a3ab254b38351 (patch)
tree3e8fe453dc0f031e93b1d71860ffb1c02448e267 /packages/linux/unslung-kernel/defconfig
parentd6ed5ee9f9682d7de5012fac6528f46675cfb43c (diff)
parent01b752a6cdf62a513886bd89bf649980f8ab1862 (diff)
merge of a83b40dbdf522cf477298e73d789074887799468
and e2fde1c5cf87c2b0a9be2dfac2a1a1937db68382
Diffstat (limited to 'packages/linux/unslung-kernel/defconfig')
-rw-r--r--packages/linux/unslung-kernel/defconfig33
1 files changed, 27 insertions, 6 deletions
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index 4f90b9dca6..7a2f164e6f 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -458,7 +458,20 @@ CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=m
+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_IPF=m
+CONFIG_BRIDGE_EBT_ARPF=m
+CONFIG_BRIDGE_EBT_VLANF=m
+CONFIG_BRIDGE_EBT_MARKF=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
@@ -513,11 +526,6 @@ CONFIG_TUN=m
CONFIG_ETHERTAP=m
#
-# Netconsole support
-#
-CONFIG_NETCONSOLE=m
-
-#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
@@ -592,6 +600,7 @@ CONFIG_8139CP_PHY_NUM=32
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set
# CONFIG_FDDI is not set
+CONFIG_NETCONSOLE=m
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
CONFIG_PPP=m
@@ -1188,6 +1197,18 @@ CONFIG_USB_SERIAL_VISOR=m
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set