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 ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sunxi-common-regulators.dtsi
diff --git
a/arch/arm/boot/dts/sunxi-common-regulators.dtsi
b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
index 17c09fed9e84d2b38490c7627b4ef938b135ddc6..ce5c53e4452fcda1357f045783d7ee0a9b343d74 100644
(file)
--- a/
arch/arm/boot/dts/sunxi-common-regulators.dtsi
+++ b/
arch/arm/boot/dts/sunxi-common-regulators.dtsi
@@
-43,7
+43,6
@@
*/
#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
&pio {
ahci_pwr_pin_a: ahci_pwr_pin@0 {