sunxi: various changes - let LBDAF be set by generic config - add high-speed timer...

[openwrt/openwrt.git] / target / linux / sunxi / config-3.12

diff --git a/target/linux/sunxi/config-3.12 b/target/linux/sunxi/config-3.12
index 6d97ba0f41e53dae6f2091c8287d2b25913e997a..b57168b2d8ac6205194165a68f14002aa90a869e 100644 (file)
--- a/target/linux/sunxi/config-3.12
+++ b/target/linux/sunxi/config-3.12
@@ -53,13 +53,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_BOUNCE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CFG80211=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_WEXT is not set
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
@@ -242,7 +235,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KSM=y
 CONFIG_KTIME_SCALAR=y
-# CONFIG_LBDAF is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_REGULATOR is not set
 CONFIG_LEGACY_PTYS=y
@@ -250,17 +242,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_MAC80211=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_HAS_RC=y
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_MESH is not set
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MDIO_BOARDINFO=y
 CONFIG_MDIO_SUN4I=y
@@ -377,6 +358,8 @@ CONFIG_STOP_MACHINE=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SUN4I_EMAC is not set
 CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
+# CONFIG_SUNXI_WATCHDOG is not set
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TASKSTATS=y
@@ -398,12 +381,9 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_NET_AX88179_178A=y
-CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUNXI_EHCI=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_USBNET=y
 # CONFIG_USER_NS is not set
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_OF=y