ARM: OMAP: Touchscreen: build cleanup

Enable TSC2101 support when Touchscreen is enabled.
Fix #if in tsc2101 driver

Signed-off-by: Kevin Hilman <kevin@hilman.org>

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 9029657cddb4fb76cd48cbcd987f1ee2f2852e15..2d34a8e4600470f570eb3b128b289e276ed79ea1 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -99,6 +99,7 @@ endif
 config TOUCHSCREEN_OMAP
        tristate "OMAP touchscreen input driver"
        depends on INPUT && INPUT_TOUCHSCREEN && ARCH_OMAP
+       select OMAP_TSC2101
        help
          Say Y here if you have an OMAP based board with touchscreen
          attached to it, e.g. OMAP Innovator, OSK, H2 or H3

diff --git a/drivers/ssi/omap-tsc2101.c b/drivers/ssi/omap-tsc2101.c
index 00d2ce5b872fb79db7e3e4f90c882f9c132aa92c..193542fc56b79cd821632d8d2020a3aea0e9ba7b 100644 (file)
--- a/drivers/ssi/omap-tsc2101.c
+++ b/drivers/ssi/omap-tsc2101.c
@@ -202,7 +202,7 @@ static int omap_tsc2101_configure(void)
 {
        unsigned long uwire_flags = 0;
 
-#if CONFIG_MACH_OMAP_H3
+#ifdef CONFIG_MACH_OMAP_H3
        int err = 0;
        u8 ioExpanderVal = 0;