From afcdc97730262abee8d95c6fb36add5272da556e Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben@simtec.co.uk>
Date: Tue, 10 Nov 2009 21:01:31 -0800
Subject: [PATCH] --- yaml --- r: 174229 b: refs/heads/master c:
 111bc59c08c437e433bd5b9cc726adaa912c6e6c h: refs/heads/master i:   174227:
 0245aced7ec31645ef03cef70b4b1c6e190921b5 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/input/keyboard/gpio_keys.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6b99d6d3edc5..660e0535a86f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db19fd8b3a3e198e84b93fa217acf77e72a4cd35
+refs/heads/master: 111bc59c08c437e433bd5b9cc726adaa912c6e6c
diff --git a/trunk/drivers/input/keyboard/gpio_keys.c b/trunk/drivers/input/keyboard/gpio_keys.c
index 5c8e2113cb34..b236709a2c01 100644
--- a/trunk/drivers/input/keyboard/gpio_keys.c
+++ b/trunk/drivers/input/keyboard/gpio_keys.c
@@ -23,8 +23,7 @@
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <linux/workqueue.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 struct gpio_button_data {
 	struct gpio_keys_button *button;