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 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun5i-a10s-auxtek-t004.dts
diff --git
a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index a27c3fa587366a19684bb151045a53cfb69d8775..16f839df42272d34b13cc088423e4bc04338ca82 100644
(file)
--- a/
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@
-168,10
+168,6
@@
status = "okay";
};
-&usb1_vbus_pin_a {
- pins = "PG13";
-};
-
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>;