Merge branch 'master' of git://nbd.name/openwrt

[openwrt/svn-archive/archive.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 60e0733a5625e936ac9f56e817eaf0b078e03fcb..c2a128dde444e9ad5d1a3061d902565d2c5ecaf4 100644 (file)
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -734,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
@@ -784,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
@@ -841,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
@@ -1005,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
@@ -1160,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
@@ -2558,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