summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-28 15:04:37 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-28 15:42:03 -0400
commitdff08547967b51d0c1a79626647971c508e4106e (patch)
tree40b21551bb741e71b5cddd31a6f156e660a1a23e /config-generic
parentc813c0daaebd5c4ceeee6faea3580d9c2e50336d (diff)
downloadkernel-dff08547967b51d0c1a79626647971c508e4106e.tar.gz
kernel-dff08547967b51d0c1a79626647971c508e4106e.tar.xz
kernel-dff08547967b51d0c1a79626647971c508e4106e.zip
Linux 3.1-git2 snapshot (upstream f362f98e7c)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 930edfd47..f9446441f 100644
--- a/config-generic
+++ b/config-generic
@@ -1965,6 +1965,7 @@ CONFIG_INPUT_CM109=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_BMA150 is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -2067,6 +2068,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
# CONFIG_TOUCHSCREEN_TPS6507X is not set
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m