projects
/
cascardo
/
linux.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.org/pub/scm/linux/kernel/git/jikos/hid
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
am3517.dtsi
diff --git
a/arch/arm/boot/dts/am3517.dtsi
b/arch/arm/boot/dts/am3517.dtsi
index
5e3f5e8
..
0db19d3
100644
(file)
--- a/
arch/arm/boot/dts/am3517.dtsi
+++ b/
arch/arm/boot/dts/am3517.dtsi
@@
-15,7
+15,7
@@
serial3 = &uart4;
};
- ocp {
+ ocp
@68000000
{
am35x_otg_hs: am35x_otg_hs@5c040000 {
compatible = "ti,omap3-musb";
ti,hwmods = "am35x_otg_hs";