From: Juha Yrjola <juha.yrjola@nokia.com>
Date: Thu, 8 Dec 2005 02:01:23 +0000 (+0200)
Subject: ARM: OMAP: Make gpio-switch driver compile again
X-Git-Tag: v2.6.15-omap2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cbbd88737f13996ce9f168e4fdf479a2fdd9220f;p=linux-2.6-omap-h63xx.git

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 787e88d8ce4..1e9025d8f85 100644
--- 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/device.h>
+#include <linux/platform_device.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;
-	int		key_code;
 	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->key_code = cfg->key_code;
 		sw->state = gpio_sw_get_state(sw);
 		if ((r = new_switch(sw)) < 0) {
 			kfree(sw);