From bf11f343e21517953fc4face4baff011e0b84bef Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 22 Sep 2009 16:46:37 -0700
Subject: [PATCH] --- yaml --- r: 164819 b: refs/heads/master c:
 d120c17faeb391f5b4b99af8b1e190619934ecdd h: refs/heads/master i:   164817:
 fc0f45e8f8a17064ed610a7b17c7f5f5e0b138a1   164815:
 9c7c23aaa900dad83b2c2c045c562441d62810c5 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/gpio/bt8xxgpio.c | 3 +--
 trunk/drivers/gpio/mcp23s08.c  | 4 +---
 trunk/drivers/gpio/pca953x.c   | 3 +--
 trunk/drivers/gpio/pcf857x.c   | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4a35bbbfec17..9d7366d0ab7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61e0671c6740273663f35357987a2f7aa27479ca
+refs/heads/master: d120c17faeb391f5b4b99af8b1e190619934ecdd
diff --git a/trunk/drivers/gpio/bt8xxgpio.c b/trunk/drivers/gpio/bt8xxgpio.c
index 55904140213b..2559f2289409 100644
--- a/trunk/drivers/gpio/bt8xxgpio.c
+++ b/trunk/drivers/gpio/bt8xxgpio.c
@@ -46,8 +46,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 /* Steal the hardware definitions from the bttv driver. */
 #include "../media/video/bt8xx/bt848.h"
diff --git a/trunk/drivers/gpio/mcp23s08.c b/trunk/drivers/gpio/mcp23s08.c
index c6c7aa15f5da..cd651ec8d034 100644
--- a/trunk/drivers/gpio/mcp23s08.c
+++ b/trunk/drivers/gpio/mcp23s08.c
@@ -6,12 +6,10 @@
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
-
+#include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/mcp23s08.h>
 
-#include <asm/gpio.h>
-
 
 /* Registers are all 8 bits wide.
  *
diff --git a/trunk/drivers/gpio/pca953x.c b/trunk/drivers/gpio/pca953x.c
index 8ab1308bec20..6a2fb3fbb3d9 100644
--- a/trunk/drivers/gpio/pca953x.c
+++ b/trunk/drivers/gpio/pca953x.c
@@ -13,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pca953x.h>
 #ifdef CONFIG_OF_GPIO
@@ -20,8 +21,6 @@
 #include <linux/of_gpio.h>
 #endif
 
-#include <asm/gpio.h>
-
 #define PCA953X_INPUT          0
 #define PCA953X_OUTPUT         1
 #define PCA953X_INVERT         2
diff --git a/trunk/drivers/gpio/pcf857x.c b/trunk/drivers/gpio/pcf857x.c
index 9525724be731..72f2449c1c87 100644
--- a/trunk/drivers/gpio/pcf857x.c
+++ b/trunk/drivers/gpio/pcf857x.c
@@ -20,11 +20,10 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pcf857x.h>
 
-#include <asm/gpio.h>
-
 
 static const struct i2c_device_id pcf857x_id[] = {
 	{ "pcf8574", 8 },