From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 29 Jul 2012 13:20:39 +0000 (+0000)
Subject: resync config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5738c960a50c8ff507708716354ca74f553d560;p=openwrt%2Fstaging%2Fflorian.git

resync config

SVN-Revision: 32908
---

diff --git a/target/linux/omap24xx/config-3.3 b/target/linux/omap24xx/config-3.3
index d72e6a1940..43bc56fc7e 100644
--- a/target/linux/omap24xx/config-3.3
+++ b/target/linux/omap24xx/config-3.3
@@ -186,7 +186,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEVKMEM=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -210,9 +209,7 @@ CONFIG_FB_OMAP_LCDC_EXTERNAL=y
 # CONFIG_FB_OMAP_LCDC_HWA742 is not set
 CONFIG_FB_OMAP_LCD_MIPID=y
 # CONFIG_FB_OMAP_MANUAL_UPDATE is not set
-# CONFIG_FB_SM7XX is not set
 # CONFIG_FB_WMT_GE_ROPS is not set
-# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FONTS=y
 # CONFIG_FONT_10x18 is not set
@@ -614,7 +611,6 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TABLET_USB_KBTAB is not set
 # CONFIG_TABLET_USB_WACOM is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TINY_PREEMPT_RCU=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
@@ -637,45 +633,29 @@ CONFIG_USB=m
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_XHCI is not set
 # CONFIG_USB_AUDIO is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
 CONFIG_USB_COMMON=m
-# CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_EEM is not set
 # CONFIG_USB_ETH_RNDIS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FUSB300 is not set
 CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GSPCA=m
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
 CONFIG_USB_G_NCM=m
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
 CONFIG_USB_HID=m
-# CONFIG_USB_M66592 is not set
 # CONFIG_USB_MUSB_AM35X is not set
 CONFIG_USB_MUSB_HDRC=m
 # CONFIG_USB_MUSB_OMAP2PLUS is not set
 CONFIG_USB_MUSB_TUSB6010=m
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_NET2272 is not set
 CONFIG_USB_NET_CDC_NCM=m
 # CONFIG_USB_OMAP is not set
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_PWC is not set
-# CONFIG_USB_R8A66597 is not set
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_TUSB_OMAP_DMA=y
 CONFIG_USB_USBNET=m
-# CONFIG_USB_ZERO is not set
 # CONFIG_USER_NS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_USB_DRIVERS=y