(no commit message)

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index f17b4ac0c64695193b183d68a4835de0b8b49a51..e89e4fd6c5171ef8b4d52f23777ba0dfc1bfcfec 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -36,6 +36,7 @@ config MACH_OMAP_H2
 config MACH_OMAP_H3
        bool "TI H3 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+       select GPIOEXPANDER_OMAP
        help
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 826e741770532fd7b0abfd9b897ef1d7cf19dcbf..60311d2ecba4cf5a79ba578dcc53c051071f6032 100644 (file)
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -250,9 +250,9 @@ static int h3_transceiver_mode(struct device *dev, int mode)
 {
        struct omap_irda_config *irda_config = dev->platform_data;
 
-       cancel_delayed_work(irda_config->gpio_expa);
-       PREPARE_WORK(irda_config->gpio_expa, set_trans_mode, &mode);
-       schedule_work(irda_config->gpio_expa);
+       cancel_delayed_work(&irda_config->gpio_expa);
+       PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
+       schedule_work(&irda_config->gpio_expa);
 
        return 0;
 }