Skip to content

Commit

Permalink
gpio: include <linux/gpio.h> not <asm/gpio.h>
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Linus Torvalds committed Sep 23, 2009
1 parent 61e0671 commit d120c17
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
3 changes: 1 addition & 2 deletions drivers/gpio/bt8xxgpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpio/mcp23s08.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpio/pca953x.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@

#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
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#endif

#include <asm/gpio.h>

#define PCA953X_INPUT 0
#define PCA953X_OUTPUT 1
#define PCA953X_INVERT 2
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpio/pcf857x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down

0 comments on commit d120c17

Please sign in to comment.