snapshot 2.6.37-git12

1 files changed, 27 insertions, 7 deletions

diff --git a/config-generic b/config-generic
index e885bca39..67483c674 100644
--- a/config-generic
+++ b/config-generic
@@ -689,6 +689,7 @@ CONFIG_DM_ZERO=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_RAID=m
 
 #
 # Fusion MPT device support
@@ -1925,6 +1926,7 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_ZHENHUA=m
+# CONFIG_JOYSTICK_AS5011 is not set
 
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_AD7879 is not set
@@ -2082,6 +2084,7 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_ISCH is not set
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_EG20T is not set
 
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
@@ -2236,6 +2239,8 @@ CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2423=m
+
 #
 # Mice
 #
@@ -3040,6 +3045,7 @@ CONFIG_HID_3M_PCT=y
 CONFIG_LOGIG940_FF=y
 CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MOSART=y
+CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
 CONFIG_HID_QUANTA=y
 CONFIG_HID_STANTUM=y
@@ -3383,6 +3389,7 @@ CONFIG_MFD_WM8400=m
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_WM831X_I2C is not set
+CONFIG_MFD_CS5535=m
 
 #
 # File systems
@@ -3723,12 +3730,14 @@ CONFIG_AUDITSYSCALL=y
 #
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_MANAGER_TESTS=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_AUTHENC=m
@@ -3736,14 +3745,14 @@ CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_GF128MUL=m
@@ -4107,15 +4116,17 @@ CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_TEST_POWER is not set
 CONFIG_APM_POWER=m
-CONFIG_WM831X_POWER=m
+# CONFIG_WM831X_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_BQ20Z75 is not set
 # CONFIG_CHARGER_ISP1704 is not set
 CONFIG_BATTERY_PMU=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_PDA_POWER is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_BATTERY_MAX17042 is not set
 
 CONFIG_AUXDISPLAY=y
 
@@ -4375,6 +4386,9 @@ CONFIG_PPS=m
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_GENERATOR_PARPORT=m
+CONFIG_NTP_PPS=y
 
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_VT6655 is not set
@@ -4440,6 +4454,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_GPIO_VX855 is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
 
 CONFIG_KSYM_TRACER=y
 CONFIG_PROFILE_KSYM_TRACER=y
@@ -4465,3 +4480,8 @@ CONFIG_SPARSE_RCU_POINTER=y
 CONFIG_BKL=y
 
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+
+# CONFIG_XZ_DEC_TEST is not set
+
+CONFIG_NFC_DEVICES=y
+CONFIG_PN544_NFC=m