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 tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun4i-a10-hackberry.dts
diff --git
a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index a48b4647441710e5e41bef064860f7744a103f3a..a1a7282199d52c893813ff2178ffecc16b8694b4 100644
(file)
--- a/
arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/
arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@
-47,7
+47,6
@@
#include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
/ {
model = "Miniand Hackberry";