From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 30 Oct 2009 12:26:28 +0000 (+0000)
Subject: ar71xx: sync 2.6.31 kernel config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6c2ad19baf22d5a956ae5851a50f24028ac6198c;p=openwrt%2Fstaging%2Fnbd.git

ar71xx: sync 2.6.31 kernel config

SVN-Revision: 18227
---

diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 0d29388da7..bc817fdc34 100644
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -34,7 +34,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ATHEROS_AR71XX=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
-# CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
@@ -42,7 +41,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CONSTRUCTORS=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CPU_HAS_LLSC=y
@@ -100,8 +98,6 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 # CONFIG_HW_RANDOM is not set
@@ -193,7 +189,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLAB is not set
-# CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y
 CONFIG_SPI=y
 CONFIG_SPI_AP83=y
@@ -213,7 +208,6 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TC35815 is not set
 CONFIG_TICK_ONESHOT=y
-CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
 CONFIG_YAFFS_9BYTE_TAGS=y