ARM: OMAP: Make gpio-switch driver compile again

Signed-off-by: Imre Deak <imre.deak@nokia.com>
Signed-off-by: Juha Yrjola <juha.yrjola@nokia.com>

diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c
index 787e88d8ce49d5fece87b18ff160a6ffcd5e7c06..1e9025d8f85761c5fc5f8b371fd7f7ef4da61d10 100644 (file)
--- a/arch/arm/plat-omap/gpio-switch.c
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -15,7 +15,7 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>

-#include <linux/device.h>
+#include <linux/platform_device.h>

 #include <linux/timer.h>
 #include <linux/err.h>
 #include <asm/arch/hardware.h>
 #include <linux/timer.h>
 #include <linux/err.h>
 #include <asm/arch/hardware.h>


@@ -29,7 +29,6 @@ struct gpio_switch {
        u16             gpio;
        int             flags;
        int             type;
        u16             gpio;
        int             flags;
        int             type;

-       int             key_code;

        int             state;
 
        struct work_struct      work;
        int             state;
 
        struct work_struct      work;


@@ -228,7 +227,6 @@ static int __init add_atag_switches(void)
                sw->gpio = cfg->gpio;
                sw->flags = cfg->flags;
                sw->type = cfg->type;
                sw->gpio = cfg->gpio;
                sw->flags = cfg->flags;
                sw->type = cfg->type;

-               sw->key_code = cfg->key_code;

                sw->state = gpio_sw_get_state(sw);
                if ((r = new_switch(sw)) < 0) {
                        kfree(sw);
                sw->state = gpio_sw_get_state(sw);
                if ((r = new_switch(sw)) < 0) {
                        kfree(sw);