diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-02 22:53:23 +0300 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-16 02:20:03 +0300 |
commit | 288e6eaa06877ea925d8dcdac5e56310fa6d8c7c (patch) | |
tree | cbde3413b52570e524fe196e548749529b0b1ab5 /arch/sh/include/mach-common/mach/magicpanelr2.h | |
parent | 047b2f62cda57eba73751b29f3cf3ef6d17ae84f (diff) | |
download | linux-288e6eaa06877ea925d8dcdac5e56310fa6d8c7c.tar.xz |
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/sh/include/mach-common/mach/magicpanelr2.h')
-rw-r--r-- | arch/sh/include/mach-common/mach/magicpanelr2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/mach-common/mach/magicpanelr2.h b/arch/sh/include/mach-common/mach/magicpanelr2.h index 183a2f744251..eb0cf205176f 100644 --- a/arch/sh/include/mach-common/mach/magicpanelr2.h +++ b/arch/sh/include/mach-common/mach/magicpanelr2.h @@ -13,7 +13,7 @@ #ifndef __ASM_SH_MAGICPANELR2_H #define __ASM_SH_MAGICPANELR2_H -#include <asm/gpio.h> +#include <linux/gpio.h> #define __IO_PREFIX mpr2 #include <asm/io_generic.h> |