summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-13 09:51:33 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-13 09:51:33 +0000
commit4b1682dd66f82e3c531c607f8fba511b14879ede (patch)
tree22dc963886544bb0f6bf76b78b2707e921803597 /target/linux
parent428f4a4fb597d08c8382ee90ac5f291dfa8b15dc (diff)
sync with the non-ramdisk config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3357 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/aruba-2.6/config-ramdisk7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/aruba-2.6/config-ramdisk b/target/linux/aruba-2.6/config-ramdisk
index 9647df2d8e..6925361d73 100644
--- a/target/linux/aruba-2.6/config-ramdisk
+++ b/target/linux/aruba-2.6/config-ramdisk
@@ -242,7 +242,6 @@ CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
-CONFIG_RING=m
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -415,6 +414,7 @@ CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_ESFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
@@ -473,7 +473,8 @@ CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
-# CONFIG_BT_HCIUSB is not set
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
@@ -836,7 +837,7 @@ CONFIG_NET_WIRELESS=y
# CONFIG_HIPPI is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
CONFIG_PPP_DEFLATE=m