linux/generic: sync to todays yaffs tree

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

diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index 199d70b..c2a128d 100644 (file)
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -374,6 +374,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_CRASHLOG=y
 # CONFIG_CRYPTO_DEV_MV_CESA is not set
 # CONFIG_CRYPTO_MANAGER_TESTS is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_PCRYPT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -430,6 +431,7 @@ CONFIG_CRYPTO_MANAGER_NO_TESTS=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
@@ -586,6 +588,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -656,6 +659,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM_MANUAL=y
@@ -730,6 +734,7 @@ CONFIG_HAVE_MLOCK=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HID_3M_PCT is not set
 # CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX_FF is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_BRIGHT is not set
@@ -780,6 +785,7 @@ CONFIG_HAVE_MLOCK=y
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
+# CONFIG_HMC6352 is not set
 # CONFIG_HOSTAP_CS is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP_PCI is not set
@@ -837,6 +843,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_ISCH is not set
 # CONFIG_I2C is not set
 # CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
@@ -1001,6 +1008,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_WINBOND_CIR is not set
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_YEALINK is not set
@@ -1156,6 +1164,7 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
 CONFIG_ISDN=y
 # CONFIG_ISDN_I4L is not set
 # CONFIG_ISDN_AUDIO is not set
@@ -1630,6 +1639,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
 CONFIG_NET_WIRELESS=y
 CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETXEN_NIC is not set
 CONFIG_NET=y
@@ -2553,16 +2563,20 @@ CONFIG_TMPFS=y
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_FILTER is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_QT602240 is not set
 # CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
@@ -3056,6 +3070,7 @@ CONFIG_XFRM=y
 CONFIG_ZISOFS=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+# CONFIG_ZRAM is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ZONE_DMA=y
 CONFIG_DEFAULT_SECURITY_DAC=y