From d3d9d55cde9d4d5612c9a12c306a7708d2dab004 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Mon, 25 Aug 2014 16:31:09 +0000
Subject: ralink: a few 3.14 related fixes

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 42292
---
 target/linux/ramips/mt7620a/config-3.14 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'target/linux/ramips/mt7620a')

diff --git a/target/linux/ramips/mt7620a/config-3.14 b/target/linux/ramips/mt7620a/config-3.14
index 1ec82aebee..a3411a70db 100644
--- a/target/linux/ramips/mt7620a/config-3.14
+++ b/target/linux/ramips/mt7620a/config-3.14
@@ -36,10 +36,10 @@ CONFIG_CSRC_R4K=y
 CONFIG_DEBUG_PINCTRL=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_DTB_MT7620A_EVAL is not set
+# CONFIG_DTB_MT7628AN_EVAL is not set
 CONFIG_DTB_RT_NONE=y
 CONFIG_DTC=y
 CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_8250 is not set
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -51,6 +51,7 @@ CONFIG_GENERIC_PCI_IOMAP=y
 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
@@ -106,8 +107,8 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_O32_FP64_SUPPORT is not set
-# CONFIG_MLX5_CORE is not set
 CONFIG_MODULES_USE_ELF_REL=y
+# CONFIG_MT7621_WDT is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_M25P80=y
@@ -120,7 +121,6 @@ CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NET_RALINK=y
 CONFIG_NET_RALINK_GSW_MT7620=y
 CONFIG_NET_RALINK_MDIO=y
-CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_NLS=m
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
 CONFIG_OF=y
@@ -180,5 +180,4 @@ CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
-# CONFIG_ZBUD is not set
 CONFIG_ZONE_DMA_FLAG=0
-- 
cgit v1.2.3