diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-02 13:53:23 -0600 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-16 00:20:03 +0100 |
| commit | 288e6eaa06877ea925d8dcdac5e56310fa6d8c7c (patch) | |
| tree | cbde3413b52570e524fe196e548749529b0b1ab5 /drivers/video/fbdev/omap | |
| parent | 047b2f62cda57eba73751b29f3cf3ef6d17ae84f (diff) | |
| download | linux-288e6eaa06877ea925d8dcdac5e56310fa6d8c7c.tar.bz2 | |
gpio: Include linux/gpio.h instead of asm/gpio.h
Most arches have an asm/gpio.h that merely includes linux/gpio.h. The
others select ARCH_HAVE_CUSTOM_GPIO_H, and when that's selected,
linux/gpio.h includes asm/gpio.h.
Therefore, code should include linux/gpio.h instead of including asm/gpio.h
directly.
Remove includes of asm/gpio.h, adding an include of linux/gpio.h when
necessary.
This is a follow-on to 7563bbf89d06 ("gpiolib/arches: Centralise
bolierplate asm/gpio.h").
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/video/fbdev/omap')
| -rw-r--r-- | drivers/video/fbdev/omap/lcd_h3.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap/lcd_osk.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap/lcd_palmtt.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/fbdev/omap/lcd_h3.c b/drivers/video/fbdev/omap/lcd_h3.c index a0729d0200d0..21512b027ff7 100644 --- a/drivers/video/fbdev/omap/lcd_h3.c +++ b/drivers/video/fbdev/omap/lcd_h3.c @@ -22,8 +22,8 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/i2c/tps65010.h> +#include <linux/gpio.h> -#include <asm/gpio.h> #include "omapfb.h" #define MODULE_NAME "omapfb-lcd_h3" diff --git a/drivers/video/fbdev/omap/lcd_osk.c b/drivers/video/fbdev/omap/lcd_osk.c index c3ddebf934b2..b56886c7055e 100644 --- a/drivers/video/fbdev/omap/lcd_osk.c +++ b/drivers/video/fbdev/omap/lcd_osk.c @@ -22,8 +22,7 @@ #include <linux/module.h> #include <linux/platform_device.h> - -#include <asm/gpio.h> +#include <linux/gpio.h> #include <mach/hardware.h> #include <mach/mux.h> diff --git a/drivers/video/fbdev/omap/lcd_palmtt.c b/drivers/video/fbdev/omap/lcd_palmtt.c index 3d0ea04ec248..1a936d5c7b6f 100644 --- a/drivers/video/fbdev/omap/lcd_palmtt.c +++ b/drivers/video/fbdev/omap/lcd_palmtt.c @@ -28,8 +28,8 @@ GPIO13 - screen blanking #include <linux/platform_device.h> #include <linux/module.h> #include <linux/io.h> +#include <linux/gpio.h> -#include <asm/gpio.h> #include "omapfb.h" static int palmtt_panel_init(struct lcd_panel *panel, |