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 /arch/avr32 | |
| parent | 047b2f62cda57eba73751b29f3cf3ef6d17ae84f (diff) | |
| download | linux-288e6eaa06877ea925d8dcdac5e56310fa6d8c7c.tar.gz linux-288e6eaa06877ea925d8dcdac5e56310fa6d8c7c.tar.bz2 linux-288e6eaa06877ea925d8dcdac5e56310fa6d8c7c.zip | |
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 'arch/avr32')
| -rw-r--r-- | arch/avr32/boards/merisc/setup.c | 1 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/pio.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c index 83d896cc2aed..718a6d7eb808 100644 --- a/arch/avr32/boards/merisc/setup.c +++ b/arch/avr32/boards/merisc/setup.c @@ -27,7 +27,6 @@ #include <asm/io.h> #include <asm/setup.h> -#include <asm/gpio.h> #include <mach/at32ap700x.h> #include <mach/board.h> diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c index 5020057ac7a2..83c2a0021b56 100644 --- a/arch/avr32/mach-at32ap/pio.c +++ b/arch/avr32/mach-at32ap/pio.c @@ -14,8 +14,8 @@ #include <linux/fs.h> #include <linux/platform_device.h> #include <linux/irq.h> +#include <linux/gpio.h> -#include <asm/gpio.h> #include <asm/io.h> #include <mach/portmux.h> |