From dee0010ae2891adc628ee979ed84792edbb34f0f Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 14 Jun 2011 20:05:03 +0000 Subject: [PATCH] resync kernel config SVN-Revision: 27173 --- target/linux/cobalt/config-default | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default index 5c08a666b4..b15f5c0f9b 100644 --- a/target/linux/cobalt/config-default +++ b/target/linux/cobalt/config-default @@ -5,7 +5,6 @@ CONFIG_64BIT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ARCH_SUPPORTS_OPROFILE=y @@ -27,6 +26,8 @@ CONFIG_BLOCK_COMPAT=y CONFIG_CEVT_GT641XX=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +CONFIG_CMDLINE="console=ttyS0,115200" CONFIG_COMPAT=y CONFIG_COMPAT_BRK=y CONFIG_COMPAT_NETLINK_MESSAGES=y @@ -36,7 +37,6 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_LOONGSON2E is not set -# CONFIG_CPU_LOONGSON2F is not set # CONFIG_CPU_MIPS32_R1 is not set # CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS64_R1 is not set @@ -69,6 +69,7 @@ CONFIG_DEVKMEM=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set # CONFIG_DM9102 is not set +CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_DNOTIFY=y CONFIG_DUMMY_CONSOLE=y @@ -77,8 +78,6 @@ CONFIG_ELF_CORE=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FB=y CONFIG_FB_COBALT=y -# CONFIG_FB_SM7XX is not set -# CONFIG_FB_XGI is not set # CONFIG_FIRMWARE_EDID is not set CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FS_POSIX_ACL=y @@ -94,11 +93,6 @@ CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y @@ -120,6 +114,7 @@ CONFIG_INPUT=y CONFIG_INPUT_COBALT_BTNS=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_POLLDEV=y +# CONFIG_INPUT_YEALINK is not set # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_MULTICAST is not set CONFIG_IRQ_CPU=y @@ -129,12 +124,9 @@ CONFIG_KEXEC=y CONFIG_LEDS_COBALT_QUBE=y CONFIG_LEDS_COBALT_RAQ=y # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # CONFIG_LEDS_TRIGGER_TIMER is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_LOONGSON_MC146818 is not set -CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set @@ -149,7 +141,6 @@ CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=y CONFIG_MIPS_COBALT=y -CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set @@ -165,7 +156,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_PHYSMAP=y -CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NETDEV_1000 is not set # CONFIG_NET_PCI is not set CONFIG_NET_TULIP=y @@ -185,7 +175,6 @@ CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set -# CONFIG_POWERTV is not set CONFIG_PROC_PAGE_MONITOR=y CONFIG_RAID_ATTRS=y CONFIG_RELAY=y @@ -195,7 +184,6 @@ CONFIG_SATA_PMP=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set -CONFIG_SCSI_MOD=y # CONFIG_SCSI_MULTI_LUN is not set CONFIG_SECCOMP=y # CONFIG_SERIAL_8250_EXTENDED is not set @@ -222,8 +210,8 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y -# CONFIG_TINY_RCU is not set CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_TREE_PREEMPT_RCU is not set CONFIG_TREE_RCU=y CONFIG_TULIP=y CONFIG_TULIP_MMIO=y