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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ge863-pro3.dtsi
diff --git
a/arch/arm/boot/dts/ge863-pro3.dtsi
b/arch/arm/boot/dts/ge863-pro3.dtsi
index 8613944ea5c5e5e7301889bff99c989ac68fd580..6a9fdc0760f0ea8c7ad502cd70dc009d49b58a59 100644
(file)
--- a/
arch/arm/boot/dts/ge863-pro3.dtsi
+++ b/
arch/arm/boot/dts/ge863-pro3.dtsi
@@
-50,7
+50,7
@@
reg = <0x0 0x7c0000>;
};
- root@
0
7c0000 {
+ root@7c0000 {
label = "root";
reg = <0x7c0000 0x7840000>;
};