git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91rm9200_devices.c
diff --git
a/arch/arm/mach-at91/at91rm9200_devices.c
b/arch/arm/mach-at91/at91rm9200_devices.c
index
7227755
..
978be95
100644
(file)
--- a/
arch/arm/mach-at91/at91rm9200_devices.c
+++ b/
arch/arm/mach-at91/at91rm9200_devices.c
@@
-14,11
+14,11
@@
#include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#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 <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>
#include <mach/at91rm9200.h>
#include <mach/at91rm9200_mc.h>