Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[android-sdk/kernel-video.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 0c45caddd41c0b3d5d4ce18238508414a1819eed..515cfe7905430fb621362231ac7dd468f42a3016 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -111,18 +111,6 @@ config TOUCHSCREEN_AUO_PIXCIR
          To compile this driver as a module, choose M here: the
          module will be called auo-pixcir-ts.
 
-config TOUCHSCREEN_BITSY
-       tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
-       depends on SA1100_BITSY
-       select SERIO
-       help
-         Say Y here if you have the h3600 (Bitsy) touchscreen.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called h3600_ts_input.
-
 config TOUCHSCREEN_BU21013
        tristate "BU21013 based touch panel controllers"
        depends on I2C