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 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91cap9_devices.c
diff --git
a/arch/arm/mach-at91/at91cap9_devices.c
b/arch/arm/mach-at91/at91cap9_devices.c
index
dba0d8d
..
f87f504
100644
(file)
--- a/
arch/arm/mach-at91/at91cap9_devices.c
+++ b/
arch/arm/mach-at91/at91cap9_devices.c
@@
-16,6
+16,7
@@
#include <asm/mach/irq.h>
#include <linux/dma-mapping.h>
#include <asm/mach/irq.h>
#include <linux/dma-mapping.h>
+#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <linux/i2c-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/board.h>
#include <mach/cpu.h>
-#include <mach/gpio.h>
#include <mach/at91cap9.h>
#include <mach/at91cap9_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/at91cap9.h>
#include <mach/at91cap9_matrix.h>
#include <mach/at91sam9_smc.h>