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

Commit 2f8163ba authored by Russell King's avatar Russell King
Browse files

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 



Convert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
before we start consolidating the individual platform implementations
of the gpio header files.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b7a94954

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
 */



#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <asm/gpio.h>

#include <asm/hardware/scoop.h>



/* PCMCIA to Scoop linkage

arch/arm/mach-at91/at91cap9_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/mach/irq.h>



#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>
@@ -23,7 +24,6 @@ 


#include <mach/board.h>

#include <mach/cpu.h>

#include <mach/gpio.h>

#include <mach/at91cap9.h>

#include <mach/at91cap9_matrix.h>

#include <mach/at91sam9_smc.h>

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
#include <asm/mach/map.h>



#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>



#include <mach/board.h>

#include <mach/gpio.h>

#include <mach/at91rm9200.h>

#include <mach/at91rm9200_mc.h>

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 
#include <asm/mach/map.h>



#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>



#include <mach/board.h>

#include <mach/gpio.h>

#include <mach/cpu.h>

#include <mach/at91sam9260.h>

#include <mach/at91sam9260_matrix.h>

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/mach/map.h>



#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>
@@ -21,7 +22,6 @@ 
#include <video/atmel_lcdc.h>



#include <mach/board.h>

#include <mach/gpio.h>

#include <mach/at91sam9261.h>

#include <mach/at91sam9261_matrix.h>

#include <mach/at91sam9_smc.h>