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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap5.dtsi
diff --git
a/arch/arm/boot/dts/omap5.dtsi
b/arch/arm/boot/dts/omap5.dtsi
index e6af460ee3011a84606547dddb0ae0cb960ec719..4cd0005e462f7a0b88577a578d0baff8f2b13714 100644
(file)
--- a/
arch/arm/boot/dts/omap5.dtsi
+++ b/
arch/arm/boot/dts/omap5.dtsi
@@
-295,6
+295,7
@@
#dma-cells = <1>;
dma-channels = <32>;
dma-requests = <127>;
+ ti,hwmods = "dma_system";
};
gpio1: gpio@4ae10000 {