resync kernel config

SVN-Revision: 20182

1 files changed, 5 insertions, 36 deletions

diff --git a/target/linux/malta/config-default b/target/linux/malta/config-default
index 67a39575ef..55a08f3162 100644
--- a/target/linux/malta/config-default
+++ b/target/linux/malta/config-default
@@ -9,29 +9,21 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 # CONFIG_ARPD is not set
-CONFIG_ATMEL=m
 CONFIG_AUTOFS_FS=y
 CONFIG_AX88796=m
 # CONFIG_AX88796_93CX6 is not set
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
-# CONFIG_BE2NET is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_DM is not set
-CONFIG_BLK_DEV_GENERIC=y
 CONFIG_BLK_DEV_IDECD=y
 CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BLK_DEV_MD is not set
-CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BNX2X is not set
 CONFIG_BOARD_SCACHE=y
 CONFIG_BONDING=m
 CONFIG_BOOT_ELF32=y
@@ -46,11 +38,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CICADA_PHY=m
 # CONFIG_CLS_U32_MARK is not set
 # CONFIG_CLS_U32_PERF is not set
+CONFIG_CMDLINE="console=ttyS0,115200 init=/etc/preinit"
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -107,7 +98,6 @@ CONFIG_DAVICOM_PHY=m
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEVKMEM=y
-CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
@@ -117,7 +107,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_ENIC is not set
 CONFIG_EQUALIZER=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
@@ -140,8 +129,6 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=m
@@ -149,13 +136,11 @@ CONFIG_I8253=y
 CONFIG_I8259=y
 CONFIG_ICPLUS_PHY=m
 CONFIG_IDE=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_IDE_ATAPI=y
 CONFIG_IDE_GD=y
 CONFIG_IDE_GD_ATA=y
 # CONFIG_IDE_GD_ATAPI is not set
 CONFIG_IDE_GENERIC=y
-CONFIG_IDE_XFER_MODE=y
 CONFIG_IFB=m
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INET_DIAG=y
@@ -173,7 +158,6 @@ CONFIG_IPC_NS=y
 CONFIG_IRQ_CPU=y
 CONFIG_IRQ_GIC=y
 CONFIG_IRQ_PER_CPU=y
-# CONFIG_IXGBE is not set
 CONFIG_JFFS2_FS_POSIX_ACL=y
 CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_JFFS2_FS_XATTR=y
@@ -203,7 +187,6 @@ CONFIG_LXT_PHY=m
 CONFIG_MACVLAN=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MD=y
-CONFIG_MDIO=m
 CONFIG_MDIO_BITBANG=m
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
@@ -224,8 +207,6 @@ CONFIG_MIPS_MT_SMP=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_VPE_LOADER is not set
 # CONFIG_MISC_DEVICES is not set
-# CONFIG_MLX4_CORE is not set
-# CONFIG_MLX4_EN is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_CFI_STAA=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
@@ -237,7 +218,6 @@ CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_NAMESPACES=y
 CONFIG_NETDEV_10000=y
-CONFIG_NETXEN_NIC=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_NAT=m
@@ -267,7 +247,6 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
-# CONFIG_NIU is not set
 CONFIG_NO_HZ=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NR_CPUS=2
@@ -276,11 +255,7 @@ CONFIG_NR_CPUS_DEFAULT_2=y
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PCI_ATMEL=m
-CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_GT64XXX_PCI0=y
-CONFIG_PCI_LEGACY=y
-CONFIG_PCNET32=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=m
 CONFIG_PID_NS=y
@@ -289,11 +264,9 @@ CONFIG_PID_NS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_PRISM54=m
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_QLGE is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_QUOTA=y
 CONFIG_QUOTACTL=y
@@ -305,7 +278,6 @@ CONFIG_RTC_CLASS=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_SCSI=y
-# CONFIG_SCSI_CXGB3_ISCSI is not set
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_NETLINK=y
@@ -313,15 +285,12 @@ CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIO=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-# CONFIG_SFC is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -360,15 +329,16 @@ CONFIG_SYS_SUPPORTS_MULTITHREADING=y
 CONFIG_SYS_SUPPORTS_SCHED_SMT=y
 CONFIG_SYS_SUPPORTS_SMARTMIPS=y
 CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_TC35815=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TEHUTI is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
 CONFIG_TUN=m
 # CONFIG_UBIFS_FS is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_USER_NS is not set
 CONFIG_USE_GENERIC_SMP_HELPERS=y
@@ -381,6 +351,5 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VXFS_FS=y
-# CONFIG_VXGE is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_WLAN_PRE80211=y