aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-07-24 17:28:25 +0000
committerJohn Crispin <john@openwrt.org>2012-07-24 17:28:25 +0000
commit5178c177dcd5bc9895a920f6c4300c8a71787955 (patch)
treeb65dfb9c6b09f9397462d029d42c0cff54c21980 /target
parent53a6946bb468e37da8430c6a7c3b027f1883a549 (diff)
downloadupstream-5178c177dcd5bc9895a920f6c4300c8a71787955.tar.gz
upstream-5178c177dcd5bc9895a920f6c4300c8a71787955.tar.bz2
upstream-5178c177dcd5bc9895a920f6c4300c8a71787955.zip
rebase config-3.3
SVN-Revision: 32797
Diffstat (limited to 'target')
-rw-r--r--target/linux/lantiq/config-3.35
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/lantiq/config-3.3 b/target/linux/lantiq/config-3.3
index fe5a8f47ea..5755501489 100644
--- a/target/linux/lantiq/config-3.3
+++ b/target/linux/lantiq/config-3.3
@@ -5,7 +5,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ATH79 is not set
CONFIG_BCMA_POSSIBLE=y
# CONFIG_BRCMUTIL is not set
CONFIG_CEVT_R4K=y
@@ -24,6 +23,7 @@ CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
+CONFIG_ETHERNET_PACKET_MANGLE=y
# CONFIG_FSNOTIFY is not set
CONFIG_GENERIC_ATOMIC64=y
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -91,6 +91,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y
# CONFIG_PREEMPT_RCU is not set
+CONFIG_PSB6970_PHY=y
CONFIG_RTL8366RB_PHY=y
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
CONFIG_RTL8366_SMI=y
@@ -108,5 +109,3 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
CONFIG_SYS_SUPPORTS_MULTITHREADING=y
CONFIG_XZ_DEC=y
CONFIG_ZONE_DMA_FLAG=0
-CONFIG_PSB6970_PHY=y
-CONFIG_ETHERNET_PACKET_MANGLE=y