[PATCH] ARM: OMAP: kconfig for H3 and gpio expander

This gets rid of some build errors on H3 by forcing the GPIO expander
to be built when the IRDA or TSC2101 drivers are in use.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 46065a2466afd06d4660f61c57820e80e3102f69..3e85c05a0db863d9e4d61f2400e28f6788b57788 100644 (file)
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -343,7 +343,8 @@ config TOSHIBA_FIR
 
 config OMAP1610_IR
         tristate "OMAP1610 IrDA(SIR/MIR/FIR)"
-        depends on IRDA
+       depends on IRDA && ARCH_OMAP
+       select GPIOEXPANDER_OMAP if MACH_OMAP_H3
         help
           Say Y here if you want to build support for the Omap1610 IR.
 

diff --git a/drivers/ssi/Kconfig b/drivers/ssi/Kconfig
index 7c8004081b38baacfc1eccd3ce15a0d713c05f73..e84f9d2a3c92658a1078c118d28f0e88abb4a407 100644 (file)
--- a/drivers/ssi/Kconfig
+++ b/drivers/ssi/Kconfig
@@ -11,6 +11,7 @@ config OMAP_TSC2101
        depends on ARCH_OMAP1 || ARCH_OMAP24XX
        tristate "TSC2101 codec support for Touchscreen and audio"
        select OMAP_UWIRE if MACH_OMAP_H3 || MACH_OMAP_H2
+       select GPIOEXPANDER_OMAP if MACH_OMAP_H3
        ---help---
          Say Y here if you want support for the TSC2101 codec.  It is
          needed for touchscreen and audio on OMAP1610 and 1710.