projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[platform/adaptation/renesas_rcar/renesas_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
6679d8a
..
0a3f30d
100644
(file)
--- a/
arch/arm/mach-ux500/board-mop500-pins.c
+++ b/
arch/arm/mach-ux500/board-mop500-pins.c
@@
-9,10
+9,9
@@
#include <linux/bug.h>
#include <linux/string.h>
#include <linux/pinctrl/machine.h>
+#include <linux/platform_data/pinctrl-nomadik.h>
#include <asm/mach-types.h>
-#include <plat/pincfg.h>
-#include <plat/gpio-nomadik.h>
#include <mach/hardware.h>