[generic] revert unrelated change in previous commit

[openwrt.git] / target / linux / generic / config-2.6.39

diff --git a/target/linux/generic/config-2.6.39 b/target/linux/generic/config-2.6.39
index 6b14416..d9a86ad 100644 (file)
--- a/target/linux/generic/config-2.6.39
+++ b/target/linux/generic/config-2.6.39
@@ -167,6 +167,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ20Z75 is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -179,6 +180,8 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 # CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCMA is not set
+CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_BE2ISCSI is not set
@@ -294,13 +297,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
@@ -502,6 +505,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
@@ -923,17 +927,9 @@ 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_IEEE1394 is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
 # CONFIG_IEEE802154 is not set
 # CONFIG_IFB is not set
 # CONFIG_IGB is not set
@@ -998,7 +994,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_INOTIFY_USER is not set
+CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT is not set
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -1293,6 +1289,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
@@ -1459,6 +1456,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
 # CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
@@ -1693,6 +1691,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
@@ -1782,6 +1781,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
 # CONFIG_OC_ETM is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_ORION_WATCHDOG is not set
@@ -1948,6 +1948,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
@@ -2050,6 +2051,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
@@ -2075,6 +2077,7 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8192SU 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
@@ -2089,6 +2092,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
@@ -2238,6 +2242,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LIS3LV02D is not set
@@ -2268,6 +2273,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_PKGTEMP is not set
 # CONFIG_SENSORS_SCH5627 is not set
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
@@ -2282,6 +2288,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_TMP421 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83627EHF is not set
@@ -2409,6 +2416,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_ES18XX is not set
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_GINA24 is not set
@@ -2531,6 +2539,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_RB4XX is not set
 # CONFIG_SPI_RB4XX_CPLD 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
@@ -2573,6 +2582,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
@@ -2628,6 +2638,7 @@ CONFIG_TINY_RCU=y
 # CONFIG_TLAN is not set
 # CONFIG_TMD_HERMES is not set
 CONFIG_TMPFS=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
@@ -2660,6 +2671,7 @@ CONFIG_TMPFS=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
@@ -2908,20 +2920,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
@@ -3140,3 +3152,4 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_ZRAM is not set
+# CONFIG_SIGMA is not set