aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2009-09-22 19:46:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 10:39:48 -0400
commitd120c17faeb391f5b4b99af8b1e190619934ecdd (patch)
tree8613dad9f9e504b57906f33650cd00c52a446414
parent61e0671c6740273663f35357987a2f7aa27479ca (diff)
gpio: include <linux/gpio.h> not <asm/gpio.h>
Drivers should be including <linux/gpio.h> not <asm/gpio.h>. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/gpio/bt8xxgpio.c3
-rw-r--r--drivers/gpio/mcp23s08.c4
-rw-r--r--drivers/gpio/pca953x.c3
-rw-r--r--drivers/gpio/pcf857x.c3
4 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpio/bt8xxgpio.c b/drivers/gpio/bt8xxgpio.c
index 55904140213b..2559f2289409 100644
--- a/drivers/gpio/bt8xxgpio.c
+++ b/drivers/gpio/bt8xxgpio.c
@@ -46,8 +46,7 @@
46#include <linux/module.h> 46#include <linux/module.h>
47#include <linux/pci.h> 47#include <linux/pci.h>
48#include <linux/spinlock.h> 48#include <linux/spinlock.h>
49 49#include <linux/gpio.h>
50#include <asm/gpio.h>
51 50
52/* Steal the hardware definitions from the bttv driver. */ 51/* Steal the hardware definitions from the bttv driver. */
53#include "../media/video/bt8xx/bt848.h" 52#include "../media/video/bt8xx/bt848.h"
diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c
index c6c7aa15f5da..cd651ec8d034 100644
--- a/drivers/gpio/mcp23s08.c
+++ b/drivers/gpio/mcp23s08.c
@@ -6,12 +6,10 @@
6#include <linux/device.h> 6#include <linux/device.h>
7#include <linux/workqueue.h> 7#include <linux/workqueue.h>
8#include <linux/mutex.h> 8#include <linux/mutex.h>
9 9#include <linux/gpio.h>
10#include <linux/spi/spi.h> 10#include <linux/spi/spi.h>
11#include <linux/spi/mcp23s08.h> 11#include <linux/spi/mcp23s08.h>
12 12
13#include <asm/gpio.h>
14
15 13
16/* Registers are all 8 bits wide. 14/* Registers are all 8 bits wide.
17 * 15 *
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 8ab1308bec20..6a2fb3fbb3d9 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -13,6 +13,7 @@
13 13
14#include <linux/module.h> 14#include <linux/module.h>
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/gpio.h>
16#include <linux/i2c.h> 17#include <linux/i2c.h>
17#include <linux/i2c/pca953x.h> 18#include <linux/i2c/pca953x.h>
18#ifdef CONFIG_OF_GPIO 19#ifdef CONFIG_OF_GPIO
@@ -20,8 +21,6 @@
20#include <linux/of_gpio.h> 21#include <linux/of_gpio.h>
21#endif 22#endif
22 23
23#include <asm/gpio.h>
24
25#define PCA953X_INPUT 0 24#define PCA953X_INPUT 0
26#define PCA953X_OUTPUT 1 25#define PCA953X_OUTPUT 1
27#define PCA953X_INVERT 2 26#define PCA953X_INVERT 2
diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c
index 9525724be731..72f2449c1c87 100644
--- a/drivers/gpio/pcf857x.c
+++ b/drivers/gpio/pcf857x.c
@@ -20,11 +20,10 @@
20 20
21#include <linux/kernel.h> 21#include <linux/kernel.h>
22#include <linux/slab.h> 22#include <linux/slab.h>
23#include <linux/gpio.h>
23#include <linux/i2c.h> 24#include <linux/i2c.h>
24#include <linux/i2c/pcf857x.h> 25#include <linux/i2c/pcf857x.h>
25 26
26#include <asm/gpio.h>
27
28 27
29static const struct i2c_device_id pcf857x_id[] = { 28static const struct i2c_device_id pcf857x_id[] = {
30 { "pcf8574", 8 }, 29 { "pcf8574", 8 },