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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
board-mop500-pins.c
diff --git
a/arch/arm/mach-ux500/board-mop500-pins.c
b/arch/arm/mach-ux500/board-mop500-pins.c
index
4108c7b
..
74bfcff
100644
(file)
--- a/
arch/arm/mach-ux500/board-mop500-pins.c
+++ b/
arch/arm/mach-ux500/board-mop500-pins.c
@@
-6,10
+6,10
@@
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/gpio.h>
#include <asm/mach-types.h>
#include <plat/pincfg.h>
+#include <plat/gpio-nomadik.h>
#include <mach/hardware.h>
#include "pins-db8500.h"