projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
sun9i-a80-optimus.dts
diff --git
a/arch/arm/boot/dts/sun9i-a80-optimus.dts
b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index
0fc3a87
..
85f1ad6
100644
(file)
--- a/
arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/
arch/arm/boot/dts/sun9i-a80-optimus.dts
@@
-46,7
+46,6
@@
#include "sun9i-a80.dtsi"
#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
/ {
model = "Merrii A80 Optimus Board";