From: David Brownell Date: Wed, 25 May 2005 20:13:16 +0000 (-0700) Subject: [PATCH] ARM: OMAP: kconfig for H3 and gpio expander X-Git-Tag: v2.6.13-omap1~137 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=01e8f4b2d8041963e417f968bf27c9637d735e95;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Tony Lindgren --- diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 46065a2466a..3e85c05a0db 100644 --- 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 7c8004081b3..e84f9d2a3c9 100644 --- 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.