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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
vexpress-v2p-ca9.dts
diff --git
a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index b608a03ee02f73f0c8d39ca546e163e9ed6053b2..c9305b58afc23d8733d6d5ee600127b5a8888248 100644
(file)
--- a/
arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/
arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@
-300,7
+300,7
@@
};
};
- smb@
0
4000000 {
+ smb@4000000 {
compatible = "simple-bus";
#address-cells = <2>;