git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun4i-a10-inet1.dts
diff --git
a/arch/arm/boot/dts/sun4i-a10-inet1.dts
b/arch/arm/boot/dts/sun4i-a10-inet1.dts
index f3092703a1a6a6b7e858d9b3a41ecaf63457826e..b8923b92cb36912041f11c6d2f03ac58ffb45229 100644
(file)
--- a/
arch/arm/boot/dts/sun4i-a10-inet1.dts
+++ b/
arch/arm/boot/dts/sun4i-a10-inet1.dts
@@
-46,7
+46,6
@@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/pwm/pwm.h>
/ {