diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 09:46:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 09:46:03 +0100 |
| commit | 072e5a1cfabca7276744d24726e094d85721df5c (patch) | |
| tree | c7237fa143f72273aa8a8179f741c24b9072001c /arch/arm/boot/dts/omap3.dtsi | |
| parent | 294fe0f52a44c6f207211de0686c369a961b5533 (diff) | |
| parent | d525211f9d1be8b523ec7633f080f2116f5ea536 (diff) | |
| download | talos-obmc-linux-072e5a1cfabca7276744d24726e094d85721df5c.tar.gz talos-obmc-linux-072e5a1cfabca7276744d24726e094d85721df5c.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/omap3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 01b71111bd55..f4f78c40b564 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -155,8 +155,8 @@ <14>, <15>; #dma-cells = <1>; - #dma-channels = <32>; - #dma-requests = <96>; + dma-channels = <32>; + dma-requests = <96>; }; omap3_pmx_core: pinmux@48002030 { |
