diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-06 21:51:39 +0000 |
---|---|---|
committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-06 21:51:39 +0000 |
commit | ba05c97e5e3ee3b0dd31b724c9053c06de99de34 (patch) | |
tree | 2a2165288eb7a080d2bcf1b27b9fe80d054b4c13 /target/linux/sunxi/config-3.12 | |
parent | e0027ed4abef834297a54d95309688bc22f4d77c (diff) | |
download | upstream-ba05c97e5e3ee3b0dd31b724c9053c06de99de34.tar.gz upstream-ba05c97e5e3ee3b0dd31b724c9053c06de99de34.tar.bz2 upstream-ba05c97e5e3ee3b0dd31b724c9053c06de99de34.zip |
sunxi: various fixes - DT: update USB vbus from 3.3v to 5v - emac: add missing free_irq - DT: add emac aliases - DT: fix interrupts on A20 - modules: add watchdog module - don't compile in mac80211 - don't compile in usbnet
Thanks to Hans de Goede, Zalan Blenessy et al.
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39204
Diffstat (limited to 'target/linux/sunxi/config-3.12')
-rw-r--r-- | target/linux/sunxi/config-3.12 | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/target/linux/sunxi/config-3.12 b/target/linux/sunxi/config-3.12 index 6d97ba0f41..3a59082717 100644 --- 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 @@ -250,17 +243,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 +359,7 @@ CONFIG_STOP_MACHINE=y CONFIG_STRICT_DEVMEM=y # CONFIG_SUN4I_EMAC is not set CONFIG_SUN4I_TIMER=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 |