summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2010-08-18 21:12:32 -0400
committerDave Jones <davej@redhat.com>2010-08-18 21:12:32 -0400
commit1bfcf9a44170f86df5a5b56f46734a6ae1aea4a2 (patch)
treed7b1b74d203bd4ccc3dc188e917be464c4d4257e /config-generic
parent9b003c30efddde58d39ca798eb9137043244fd2c (diff)
downloadkernel-1bfcf9a44170f86df5a5b56f46734a6ae1aea4a2.tar.gz
kernel-1bfcf9a44170f86df5a5b56f46734a6ae1aea4a2.tar.xz
kernel-1bfcf9a44170f86df5a5b56f46734a6ae1aea4a2.zip
group all the touchscreen options together (and sort)
TODO: Do we actually care about any of these ? If there's no userland support, we should probably kill them all.
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic22
1 files changed, 12 insertions, 10 deletions
diff --git a/config-generic b/config-generic
index 7fc76ef51..7fae0c7f1 100644
--- a/config-generic
+++ b/config-generic
@@ -1907,17 +1907,26 @@ CONFIG_JOYSTICK_XPAD=m
CONFIG_JOYSTICK_XPAD_FF=y
CONFIG_JOYSTICK_XPAD_LEDS=y
CONFIG_JOYSTICK_ZHENHUA=m
+
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_EETI=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
CONFIG_TOUCHSCREEN_HTCPEN=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_MCS5000=m
CONFIG_TOUCHSCREEN_MK712=m
+# CONFIG_TOUCHSCREEN_QT602240 is not set
CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
@@ -1925,15 +1934,9 @@ CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
CONFIG_TOUCHSCREEN_USB_E2I=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
# CONFIG_TOUCHSCREEN_WM97XX is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_QT602240 is not set
-CONFIG_TOUCHSCREEN_EETI=m
CONFIG_TOUCHSCREEN_W90X900=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-# CONFIG_TOUCHSCREEN_TPS6507X is not set
+
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
CONFIG_INPUT_UINPUT=m
@@ -4347,7 +4350,6 @@ CONFIG_IR_CORE=m
CONFIG_IR_ENE=m
CONFIG_IR_STREAMZAP=m
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_MAX8998 is not set