aboutsummaryrefslogtreecommitdiffstats
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
commit6f8a78e39b49fec9dc33420b4ea163f23cafc6f1 (patch)
tree9bc96ee38c29e53964f6588ef1d0f33102644cbd
parent7c8eb6cec380ad33f52b882b9ad94c5e2868ec54 (diff)
downloadupstream-6f8a78e39b49fec9dc33420b4ea163f23cafc6f1.tar.gz
upstream-6f8a78e39b49fec9dc33420b4ea163f23cafc6f1.tar.bz2
upstream-6f8a78e39b49fec9dc33420b4ea163f23cafc6f1.zip
kirkwood: refresh kernel config
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43432 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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