linux/3.3: merge recent ubifs patches from 3.2

[oweals/openwrt.git] / target / linux / generic / config-3.0

diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index 83d4f7065de3f77d6b2a72c35a7341bfe96c8fb5..5bfc3e7937392c64f3e6b45d09e2d4dd006e935e 100644 (file)
--- a/target/linux/generic/config-3.0
+++ b/target/linux/generic/config-3.0
@@ -259,6 +259,7 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_BLOCK=y
 # CONFIG_BMP085 is not set
+# CONFIG_BNA is not set
 # CONFIG_BNX2 is not set
 # CONFIG_BONDING is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
@@ -286,13 +287,13 @@ CONFIG_BRIDGE=y
 # CONFIG_BRIDGE_EBT_T_NAT is not set
 # CONFIG_BRIDGE_EBT_ULOG is not set
 # CONFIG_BRIDGE_EBT_VLAN is not set
-CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
 # CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BSD_DISKLABEL is not set
-CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_BT is not set
 # CONFIG_BTRFS_FS is not set
@@ -349,6 +350,7 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_CHR_DEV_SG is not set
@@ -496,6 +498,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
@@ -504,7 +507,8 @@ CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -567,6 +571,7 @@ CONFIG_DEVPORT=y
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
+# CONFIG_EARLY_PRINTK is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
@@ -914,7 +919,7 @@ CONFIG_HZ_100=y
 # CONFIG_IDE is not set
 # CONFIG_IDE_GD is not set
 # CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
+# CONFIG_IDE_PROC_FS is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IDEAPAD_LAPTOP is not set
 # CONFIG_IEEE802154 is not set
@@ -1273,6 +1278,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LXT_PHY is not set
 CONFIG_LZMA_COMPRESS=y
 CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
 # CONFIG_MAC80211 is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -1674,6 +1680,7 @@ CONFIG_NFS_V3=y
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CONNTRACK_TIMESTAMP is not set
 # CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NF_CT_PROTO_GRE is not set
@@ -1931,6 +1938,7 @@ CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
 # CONFIG_PSTORE is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QLCNIC is not set
@@ -2031,6 +2039,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
@@ -2056,6 +2065,7 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8192E is not set
 # CONFIG_RTL8192U is not set
 # CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8367_PHY is not set
 # CONFIG_RTL8366RB_PHY is not set
 # CONFIG_RTL8366S_PHY is not set
 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set
@@ -2070,6 +2080,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SATA_ACARD_AHCI is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
@@ -2176,6 +2187,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADCXX is not set
@@ -2303,6 +2315,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIO is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SFI is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_IP22 is not set
@@ -2447,6 +2460,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PCXHR is not set
 # CONFIG_SND_PDAUDIOCF is not set
 # CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_PPC is not set
 # CONFIG_SND_RAWMIDI is not set
 # CONFIG_SND_RIPTIDE is not set
 # CONFIG_SND_RME32 is not set
@@ -2510,8 +2524,10 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PPC4xx is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
@@ -2549,6 +2565,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUSPEND is not set
 CONFIG_SWAP=y
 # CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
@@ -2632,6 +2649,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
@@ -2882,20 +2900,20 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SPEEDTOUCH is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_ALAUDA=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_SUSPEND is not set