projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap36xx.dtsi
diff --git
a/arch/arm/boot/dts/omap36xx.dtsi
b/arch/arm/boot/dts/omap36xx.dtsi
index
8b79791
..
718fa88
100644
(file)
--- a/
arch/arm/boot/dts/omap36xx.dtsi
+++ b/
arch/arm/boot/dts/omap36xx.dtsi
@@
-30,7
+30,7
@@
};
};
};
};
- ocp {
+ ocp
@68000000
{
uart4: serial@49042000 {
compatible = "ti,omap3-uart";
reg = <0x49042000 0x400>;
uart4: serial@49042000 {
compatible = "ti,omap3-uart";
reg = <0x49042000 0x400>;