From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 1 Nov 2010 13:09:26 +0000 (+0000)
Subject: resync kernel config
X-Git-Tag: reboot~18537
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=cbf63d4c939bdf3273f0dbc11e93f5343541d0f6

resync kernel config

SVN-Revision: 23759
---

diff --git a/target/linux/ep93xx/config-2.6.30 b/target/linux/ep93xx/config-2.6.30
index 496fd61a31..70e26e4f9c 100644
--- a/target/linux/ep93xx/config-2.6.30
+++ b/target/linux/ep93xx/config-2.6.30
@@ -9,10 +9,10 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_VIC=y
-CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
@@ -22,15 +22,15 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit"
 CONFIG_COMMON_CLKDEV=y
 CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CPU_32v4T=y
 CONFIG_CPU_32=y
+CONFIG_CPU_32v4T=y
 CONFIG_CPU_ABRT_EV4T=y
 CONFIG_CPU_ARM920T=y
 CONFIG_CPU_CACHE_V4WT=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
@@ -41,14 +41,14 @@ CONFIG_CRUNCH=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
 CONFIG_CRYPTO_PCBC=y
@@ -68,14 +68,15 @@ CONFIG_EP93XX_EARLY_UART1=y
 # CONFIG_EP93XX_EARLY_UART3 is not set
 CONFIG_EP93XX_ETH=y
 CONFIG_EP93XX_WATCHDOG=y
+CONFIG_FB=y
 # CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_EP93XX_MONO is not set
 CONFIG_FB_EP93XX=y
-CONFIG_FB=y
+# CONFIG_FB_EP93XX_MONO is not set
 # CONFIG_FIRMWARE_EDID is not set
+CONFIG_FONTS=y
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_6x11 is not set
 # CONFIG_FONT_7x14 is not set
@@ -86,13 +87,12 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 is not set
-CONFIG_FONTS=y
 # CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE_XP=y
 CONFIG_FPE_NWFPE=y
+CONFIG_FPE_NWFPE_XP=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_GENERIC_CLOCKEVENTS is not set
@@ -119,47 +119,49 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_EP93XX=y
-CONFIG_I2C=y
-CONFIG_IKCONFIG_PROC=y
 CONFIG_IKCONFIG=y
-CONFIG_INOTIFY_USER=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_INPUT=y
 # CONFIG_INPUT_MISC is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT=y
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_I4L is not set
 CONFIG_LCD_HD44780=m
 CONFIG_LCD_LINUX=m
-CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LOCK_KERNEL=y
+CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO=y
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_MACH_ADSSPHERE is not set
-# CONFIG_MACH_EDB9302A is not set
 # CONFIG_MACH_EDB9302 is not set
-# CONFIG_MACH_EDB9307A is not set
+# CONFIG_MACH_EDB9302A is not set
 # CONFIG_MACH_EDB9307 is not set
+# CONFIG_MACH_EDB9307A is not set
 # CONFIG_MACH_EDB9312 is not set
-# CONFIG_MACH_EDB9315A is not set
 # CONFIG_MACH_EDB9315 is not set
+# CONFIG_MACH_EDB9315A is not set
 # CONFIG_MACH_GESBC9312 is not set
-# CONFIG_MACH_MICRO9H is not set
 # CONFIG_MACH_MICRO9 is not set
+# CONFIG_MACH_MICRO9H is not set
 # CONFIG_MACH_MICRO9L is not set
 # CONFIG_MACH_MICRO9M is not set
 CONFIG_MACH_SIM_ONE=y
 # CONFIG_MACH_TS72XX is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MISC_DEVICES is not set
+CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SPI=y
-CONFIG_MMC=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_GEOMETRY is not set
@@ -177,16 +179,16 @@ CONFIG_PREEMPT=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
 # CONFIG_SLOW_WORK is not set
+CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_EP93XX=y
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
-CONFIG_SPI=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -200,9 +202,9 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_VT=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZONE_DMA_FLAG=0