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 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91sam9263_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9263_devices.c
b/arch/arm/mach-at91/at91sam9263_devices.c
index
a050f41
..
dd7662b
100644
(file)
--- a/
arch/arm/mach-at91/at91sam9263_devices.c
+++ b/
arch/arm/mach-at91/at91sam9263_devices.c
@@
-13,6
+13,7
@@
#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 <linux/platform_device.h>
#include <linux/i2c-gpio.h>
@@
-20,7
+21,6
@@
#include <video/atmel_lcdc.h>
#include <mach/board.h>
#include <video/atmel_lcdc.h>
#include <mach/board.h>
-#include <mach/gpio.h>
#include <mach/at91sam9263.h>
#include <mach/at91sam9263_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/at91sam9263.h>
#include <mach/at91sam9263_matrix.h>
#include <mach/at91sam9_smc.h>