From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 13 Mar 2006 09:51:33 +0000 (+0000)
Subject: sync with the non-ramdisk config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=58e59032fbee05d58a358151e57e9f20341e237c;p=openwrt%2Fstaging%2Fwigyori.git

sync with the non-ramdisk config

SVN-Revision: 3357
---

diff --git a/openwrt/target/linux/aruba-2.6/config-ramdisk b/openwrt/target/linux/aruba-2.6/config-ramdisk
index 9647df2d8e..6925361d73 100644
--- a/openwrt/target/linux/aruba-2.6/config-ramdisk
+++ b/openwrt/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