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 'for-linus' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
axp209.dtsi
diff --git
a/arch/arm/boot/dts/axp209.dtsi
b/arch/arm/boot/dts/axp209.dtsi
index 3c8fa26e87b70c71d0bdb3e10d8b9f3219c1f130..897103e0a79bf3b4be99d8b8f2a8a48bb0b22672 100644
(file)
--- a/
arch/arm/boot/dts/axp209.dtsi
+++ b/
arch/arm/boot/dts/axp209.dtsi
@@
-107,7
+107,7
@@
};
};
- usb_power_supply: usb
_power_
supply {
+ usb_power_supply: usb
-power-
supply {
compatible = "x-powers,axp202-usb-power-supply";
status = "disabled";
};