Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288e6eaa authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Walleij
Browse files

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 7563bbf8 ("gpiolib/arches: Centralise
bolierplate asm/gpio.h").

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 047b2f62

arch/avr32/boards/merisc/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include <asm/io.h>

#include <asm/setup.h>

#include <asm/gpio.h>



#include <mach/at32ap700x.h>

#include <mach/board.h>

arch/avr32/mach-at32ap/pio.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/blackfin/kernel/debug-mmrs.c

+1 −1
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/i2c/bfin_twi.h>

#include <linux/gpio.h>



#include <asm/blackfin.h>

#include <asm/gpio.h>

#include <asm/gptimers.h>

#include <asm/bfin_can.h>

#include <asm/bfin_dma.h>

arch/blackfin/mach-bf538/boards/ezkit.c

+1 −1
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
#include <linux/spi/flash.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>

#include <asm/bfin5xx_spi.h>

#include <asm/dma.h>

#include <asm/gpio.h>

#include <asm/nand.h>

#include <asm/portmux.h>

#include <asm/dpmc.h>

arch/blackfin/mach-bf538/ext-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 


#include <linux/module.h>

#include <linux/err.h>

#include <linux/gpio.h>

#include <asm/blackfin.h>

#include <asm/gpio.h>

#include <asm/portmux.h>



#define DEFINE_REG(reg, off) \