projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-ux500
/
board-mop500-audio.c
diff --git
a/arch/arm/mach-ux500/board-mop500-audio.c
b/arch/arm/mach-ux500/board-mop500-audio.c
index 7adbed5df8a1835f2a9cd37dad53e7628cd9906d..bde91a58e105f93a8a547369f8f2e0570a459aab 100644
(file)
--- a/
arch/arm/mach-ux500/board-mop500-audio.c
+++ b/
arch/arm/mach-ux500/board-mop500-audio.c
@@
-7,9
+7,8
@@
#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/gpio.h>
+#include <linux/platform_data/pinctrl-nomadik.h>
-#include <plat/gpio-nomadik.h>
-#include <plat/pincfg.h>
#include <plat/ste_dma40.h>
#include <mach/devices.h>