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-nomadik
/
cpu-8815.c
diff --git
a/arch/arm/mach-nomadik/cpu-8815.c
b/arch/arm/mach-nomadik/cpu-8815.c
index
ac58e3b
..
dc67717
100644
(file)
--- a/
arch/arm/mach-nomadik/cpu-8815.c
+++ b/
arch/arm/mach-nomadik/cpu-8815.c
@@
-21,8
+21,8
@@
#include <linux/device.h>
#include <linux/amba/bus.h>
#include <linux/platform_device.h>
-#include <linux/gpio.h>
+#include <plat/gpio-nomadik.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include <asm/mach/map.h>