aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/config-3.14
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-30 01:14:14 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-30 01:14:14 +0000
commit5c4f9198bbe94d5ae513e601631393048ecc61b7 (patch)
tree9cf681b398e11eab824ec6532a74339d7af3a565 /target/linux/kirkwood/config-3.14
parentdac3d29ec5ec3bea5703f1e197f55af59eaa9443 (diff)
downloadupstream-5c4f9198bbe94d5ae513e601631393048ecc61b7.tar.gz
upstream-5c4f9198bbe94d5ae513e601631393048ecc61b7.tar.bz2
upstream-5c4f9198bbe94d5ae513e601631393048ecc61b7.zip
kirkwood: refresh kernel config
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43432
Diffstat (limited to 'target/linux/kirkwood/config-3.14')
-rw-r--r--target/linux/kirkwood/config-3.145
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/kirkwood/config-3.14 b/target/linux/kirkwood/config-3.14
index 5d9c47cf5b..d1c9fd4fe7 100644
--- a/target/linux/kirkwood/config-3.14
+++ b/target/linux/kirkwood/config-3.14
@@ -62,12 +62,12 @@ CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_LZO=y
CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
-CONFIG_DEBUG_LL_UART_8250=y
+CONFIG_DEBUG_UART_8250=y
# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
CONFIG_DEBUG_UART_8250_SHIFT=2
# CONFIG_DEBUG_UART_8250_WORD is not set
CONFIG_DEBUG_UART_PHYS=0xf1012000
-# CONFIG_DEBUG_LL_UART_PL01X is not set
+# CONFIG_DEBUG_UART_PL01X is not set
CONFIG_DEBUG_UART_VIRT=0xfed12000
# CONFIG_DEBUG_USER is not set
# CONFIG_DLCI is not set
@@ -84,7 +84,6 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
CONFIG_GENERIC_IO=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_PHY=y
CONFIG_GENERIC_SCHED_CLOCK=y