aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/mt7621
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-08-25 16:31:09 +0000
committerJohn Crispin <john@openwrt.org>2014-08-25 16:31:09 +0000
commitd3d9d55cde9d4d5612c9a12c306a7708d2dab004 (patch)
treec8107c66de675089670fda55824c6280bc5036d2 /target/linux/ramips/mt7621
parent843fc45e27e41beec8549ea1241a522bea3c7ea2 (diff)
downloadupstream-d3d9d55cde9d4d5612c9a12c306a7708d2dab004.tar.gz
upstream-d3d9d55cde9d4d5612c9a12c306a7708d2dab004.tar.bz2
upstream-d3d9d55cde9d4d5612c9a12c306a7708d2dab004.zip
ralink: a few 3.14 related fixes
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 42292
Diffstat (limited to 'target/linux/ramips/mt7621')
-rw-r--r--target/linux/ramips/mt7621/config-3.145
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ramips/mt7621/config-3.14 b/target/linux/ramips/mt7621/config-3.14
index cb00c5149d..ec40645a28 100644
--- a/target/linux/ramips/mt7621/config-3.14
+++ b/target/linux/ramips/mt7621/config-3.14
@@ -39,7 +39,6 @@ CONFIG_DMA_NONCOHERENT=y
CONFIG_DTB_RT_NONE=y
CONFIG_DTC=y
CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_8250 is not set
CONFIG_ESW_DOUBLE_VLAN_TAG=y
# CONFIG_GE1_MII_AN is not set
# CONFIG_GE1_MII_FORCE_100 is not set
@@ -60,6 +59,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVRES=y
# CONFIG_GPIO_MT7621 is not set
+CONFIG_GPIO_RALINK=y
CONFIG_GPIO_SYSFS=y
CONFIG_HARDWARE_WATCHPOINTS=y
CONFIG_HAS_DMA=y
@@ -122,7 +122,6 @@ CONFIG_MIPS_MT_SMP=y
# CONFIG_MIPS_O32_FP64_SUPPORT is not set
CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y
# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_MLX5_CORE is not set
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MT7621_ASIC=y
# CONFIG_MT7621_WDT is not set
@@ -135,7 +134,6 @@ CONFIG_MTD_UIMAGE_SPLIT=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NET_FLOW_LIMIT=y
# CONFIG_NET_RALINK is not set
-CONFIG_NET_RX_BUSY_POLL=y
CONFIG_NLS=m
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
CONFIG_NR_CPUS=4
@@ -233,5 +231,4 @@ CONFIG_WAN_AT_P0=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WEAK_ORDERING=y
CONFIG_XPS=y
-# CONFIG_ZBUD is not set
CONFIG_ZONE_DMA_FLAG=0