[kernel/2.6.37] refresh patches

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

diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31
index e81a4d7..2435035 100644 (file)
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@@ -150,6 +150,7 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
 # CONFIG_BCM43XX_DMA_MODE is not set
 CONFIG_BCM43XX_PIO=y
 # CONFIG_BCM43XX_PIO_MODE is not set
 # CONFIG_BCM43XX_DMA_MODE is not set
 CONFIG_BCM43XX_PIO=y
 # CONFIG_BCM43XX_PIO_MODE is not set

+# CONFIG_BCMA is not set

 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_BINARY_PRINTF is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_BINARY_PRINTF is not set


@@ -266,7 +267,7 @@ CONFIG_BRIDGE=y
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BSD_DISKLABEL 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
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_BT is not set
 # CONFIG_BTRFS_FS is not set


@@ -428,6 +429,7 @@ CONFIG_CRYPTO=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set

+# CONFIG_DEBUG_LOCKDEP is not set

 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_RODATA is not set


@@ -776,7 +778,7 @@ CONFIG_HZ_100=y
 # CONFIG_IDE_GD is not set
 CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IDE_PHISON is not set
 # CONFIG_IDE_GD is not set
 CONFIG_IDE_MAX_HWIFS=4
 # 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_IEEE1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set


@@ -828,8 +830,8 @@ CONFIG_INET=y
 # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
 CONFIG_INITRAMFS_COMPRESSION_NONE=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
 CONFIG_INITRAMFS_COMPRESSION_NONE=y
 CONFIG_INIT_ENV_ARG_LIMIT=32

-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y

 # CONFIG_INPUT is not set
 # CONFIG_INPUT_APANEL is not set
 # CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT is not set
 # CONFIG_INPUT_APANEL is not set
 # CONFIG_INPUT_ATI_REMOTE is not set


@@ -1467,6 +1469,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set

+# CONFIG_NF_CONNTRACK_ZONES is not set

 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set


@@ -1552,6 +1555,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_OCFNULL is not set
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set

+# CONFIG_OCF_UBSEC_SSB is not set

 # CONFIG_OMFS_FS is not set
 # CONFIG_OPROFILE is not set
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPROFILE is not set
 # CONFIG_OSF_PARTITION is not set


@@ -1697,6 +1701,8 @@ CONFIG_PROC_FS=y
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set

+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set

 # CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set


@@ -1782,6 +1788,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_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_RS5C348 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set


@@ -2201,6 +2208,7 @@ CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_POSSIBLE=y

+# CONFIG_SSB_SDIOHOST is not set

 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y


@@ -2530,10 +2538,18 @@ 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_SPEEDTOUCH is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_STORAGE is not set

+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set

 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DEBUG is not set

-CONFIG_USB_STORAGE_DPCM=y
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set

 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_ONETOUCH is not set

-# CONFIG_USB_STORAGE_SIERRA 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_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set