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 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
aspeed-bmc-inspur-fp5280g2.dts
diff --git
a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
index 628195b66d465ac4bda65ec7f71085668ef254fb..e9d714a46a60ba7b41e7f40d318c0ee74f27fd69 100644
(file)
--- a/
arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
+++ b/
arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
@@
-725,9
+725,9
@@
reg = <0x58>;
};
- power-supply@5
a
{
+ power-supply@5
9
{
compatible = "pmbus";
- reg = <0x5
a
>;
+ reg = <0x5
9
>;
};
};