From 44fa04d7cd871d9aed1b2d51ec07d3809fc85319 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 5 Oct 2009 19:20:30 +0000
Subject: resync kernel configuration, enable netfilter and wireless extensions

SVN-Revision: 17922
---
 target/linux/cobalt/config-default | 81 +++++++-------------------------------
 1 file changed, 15 insertions(+), 66 deletions(-)

(limited to 'target/linux/cobalt/config-default')

diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default
index fba10f4..d040b73 100644
--- a/target/linux/cobalt/config-default
+++ b/target/linux/cobalt/config-default
@@ -13,6 +13,7 @@ CONFIG_ATA=y
 CONFIG_ATA_SFF=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
+# CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_ELF32=y
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
@@ -26,7 +27,6 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_CEVT_GT641XX=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
-# CONFIG_CFG80211 is not set
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BRK=y
 CONFIG_CONSOLE_TRANSLATIONS=y
@@ -59,17 +59,16 @@ CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRC16=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
-# CONFIG_DCB is not set
 CONFIG_DE2104X=y
 # CONFIG_DE4X5 is not set
 # CONFIG_DEBUG_FS is not set
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEVKMEM=y
 CONFIG_DEVPORT=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set
 # CONFIG_DM9102 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -80,11 +79,11 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXPORTFS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_EXT3_FS_XATTR=y
@@ -96,6 +95,7 @@ CONFIG_FB=y
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_CFB_COPYAREA is not set
 # CONFIG_FB_CFB_FILLRECT is not set
@@ -137,7 +137,7 @@ CONFIG_FB_COBALT=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -146,7 +146,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GREENASIA_FF is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -154,12 +153,11 @@ 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_OPROFILE=y
 CONFIG_HAVE_SYSCALL_WRAPPERS=y
 CONFIG_HID=m
-# CONFIG_HID_NTRIG is not set
 CONFIG_HID_SUPPORT=y
-# CONFIG_HID_TOPSEED is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_HAS_PCI=y
@@ -180,7 +178,6 @@ CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 CONFIG_INPUT_COBALT_BTNS=y
 CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_MISC=y
 CONFIG_INPUT_POLLDEV=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -188,7 +185,7 @@ CONFIG_INPUT_POLLDEV=y
 CONFIG_IRQ_CPU=y
 CONFIG_IRQ_GT641XX=y
 # CONFIG_ISDN is not set
-CONFIG_JBD=y
+CONFIG_JBD=m
 # CONFIG_JFFS2_FS is not set
 CONFIG_KEXEC=y
 CONFIG_LEDS_COBALT_QUBE=y
@@ -199,11 +196,9 @@ CONFIG_LEDS_COBALT_RAQ=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set
-# CONFIG_LIB80211 is not set
 CONFIG_LIBCRC32C=y
 CONFIG_LOCKD=y
 # CONFIG_LOGO is not set
-# CONFIG_MAC80211 is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -217,6 +212,7 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_N32=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS_COBALT=y
+# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
@@ -225,52 +221,14 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MISC_DEVICES is not set
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
 # CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK2MTD is not set
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_CFI is not set
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_JEDECPROBE=y
-# CONFIG_MTD_LPDDR is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
 CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_NEC_MARKEINS is not set
 # CONFIG_NETDEV_1000 is not set
-# CONFIG_NETFILTER is not set
 CONFIG_NET_KEY=y
 CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_NET_PCI is not set
@@ -289,13 +247,12 @@ CONFIG_NFS_V3_ACL=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PATA_SCH is not set
 CONFIG_PATA_VIA=y
 CONFIG_PCI=y
+CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_GT64XXX_PCI0=y
 CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_STUB is not set
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PMC_MSP is not set
@@ -306,19 +263,12 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_RAID_ATTRS=y
 CONFIG_RELAY=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_SATA_PMP=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
@@ -336,14 +286,13 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # 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_SLUB_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
-CONFIG_SSB_POSSIBLE=y
 CONFIG_SUNRPC=y
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_NEVADA=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
@@ -351,6 +300,7 @@ CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TRACING_SUPPORT=y
 CONFIG_TULIP=y
 CONFIG_TULIP_MMIO=y
 CONFIG_TULIP_MWI=y
@@ -384,7 +334,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_WATCHDOG is not set
 # CONFIG_WINBOND_840 is not set
-# CONFIG_WIRELESS_EXT is not set
 # CONFIG_WLAN_80211 is not set
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_USER=y
-- 
cgit v1.1