ar71xx: sync 2.6.31 kernel config

[openwrt.git] / target / linux / ar71xx / config-2.6.31

diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 34b82b8..bc817fd 100644 (file)
--- 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
@@ -110,7 +106,7 @@ CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_GPIO=y
 CONFIG_ICPLUS_PHY=y
-# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_SOURCE="../../root"
@@ -143,6 +139,7 @@ CONFIG_MTD_AR91XX_FLASH=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_M25P80=y
+CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_RB4XX=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
@@ -173,7 +170,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROM_EMU=y
 CONFIG_RTL8306_PHY=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA 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