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 'dm-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-bone-common.dtsi
diff --git
a/arch/arm/boot/dts/am335x-bone-common.dtsi
b/arch/arm/boot/dts/am335x-bone-common.dtsi
index
e3f27ec
..
2e7d932
100644
(file)
--- a/
arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/
arch/arm/boot/dts/am335x-bone-common.dtsi
@@
-183,7
+183,7
@@
&usb {
status = "okay";
- control@44e10
00
0 {
+ control@44e10
62
0 {
status = "okay";
};
@@
-204,7
+204,7
@@
dr_mode = "host";
};
- dma-controller@
0
7402000 {
+ dma-controller@
4
7402000 {
status = "okay";
};
};