sync kernel config

SVN-Revision: 15923

1 files changed, 17 insertions, 36 deletions

diff --git a/target/linux/gemini/config-default b/target/linux/gemini/config-default
index 3b5c175822..0b11118857 100644
--- a/target/linux/gemini/config-default
+++ b/target/linux/gemini/config-default
@@ -13,40 +13,33 @@ CONFIG_ARM=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
+# CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=32M"
-CONFIG_CPU_32v4=y
 CONFIG_CPU_32=y
+CONFIG_CPU_32v4=y
 CONFIG_CPU_ABRT_EV4=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_CACHE_FA=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_FA=y
-CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 CONFIG_CPU_FA526=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_FA=y
 CONFIG_CRC16=y
-# CONFIG_DCB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DLCI=m
 CONFIG_DLCI_MAX=8
 # CONFIG_DM9000 is not set
 CONFIG_DMADEVICES=y
 CONFIG_DNOTIFY=y
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_FAULT_INJECTION is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
@@ -72,66 +65,54 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
+CONFIG_HDLC=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
-CONFIG_HDLC=m
 CONFIG_HDLC_PPP=m
 CONFIG_HDLC_RAW=m
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-# CONFIG_KGDB is not set
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LIB80211 is not set
-# CONFIG_LOCK_STAT is not set
 # CONFIG_MACH_NAS4220B is not set
 # CONFIG_MACH_RUT100 is not set
 CONFIG_MACH_WBD111=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_GPIO=y
-CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MG_DISK is not set
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD=y
-# CONFIG_NET_SCH_DRR is not set
 # CONFIG_NEW_LEDS is not set
+CONFIG_NLATTR=y
 # CONFIG_NO_IOPORT is not set
-# CONFIG_NVRAM is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_PHYLIB=y
 CONFIG_SCSI=m
 # CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SLOW_WORK is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SSB_POSSIBLE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_TIMER_STATS is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACING_SUPPORT=y
 CONFIG_UID16=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
 CONFIG_USB=m
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VM_EVENT_COUNTERS=y