Merge http://fbdev.bkbits.net/fbdev-2.5

into heisenberg.transvirtual.com:/tmp/fbdev-2.5

1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/input/touchscreen/Config.help b/drivers/input/touchscreen/Config.help
new file mode 100644
index 000000000000..d31ba3326e0a
--- /dev/null
+++ b/drivers/input/touchscreen/Config.help
@@ -0,0 +1,16 @@
+CONFIG_INPUT_TOUCHSCREEN
+  Say Y here, and a list of supported touchscreens will be displayed.
+  This option doesn't affect the kernel.
+
+  If unsure, say Y.
+
+CONFIG_TOUCHSCREEN_GUNZE
+  Say Y here if you have the Gunze AHL-51 touchscreen connected to
+  your system.
+
+  If unsure, say N.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called gunze.o. If you want to compile it as a
+  module, say M here and read <file:Documentation/modules.txt>.