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 branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
boot
/
dts
/
qca
/
ar9132.dtsi
diff --git
a/arch/mips/boot/dts/qca/ar9132.dtsi
b/arch/mips/boot/dts/qca/ar9132.dtsi
index 1fe561c5f90e76f5558231a8af4d59576b2ae282..61dcfa5b6ca78a843459d1c82a4d60289df11d32 100644
(file)
--- a/
arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/
arch/mips/boot/dts/qca/ar9132.dtsi
@@
-161,7
+161,7
@@
usb_phy: usb-phy {
compatible = "qca,ar7100-usb-phy";
- reset-names = "
usb-phy", "usb-
suspend-override";
+ reset-names = "
phy", "
suspend-override";
resets = <&rst 4>, <&rst 3>;
#phy-cells = <0>;