| commit | 33b5280c7d9d8641c2f9bc88a739786c838d0058 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Apr 04 21:13:41 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Apr 04 21:13:40 2013 -0700 |
| tree | 0b70dfe39dc6556e570d0d9d79242e929856e5a0 | |
| parent | d5680b0a04dbd81e6e1772743ffe43b7ec762032 [diff] | |
| parent | 6d44ba233b5a4c1cd6e43975acbf4ee76aef4b4c [diff] |
Merge "arm/dt: zinc: Add kmalloc heap"
diff --git a/arch/arm/boot/dts/msmzinc-ion.dtsi b/arch/arm/boot/dts/msmzinc-ion.dtsi index 4bf078a..aac4230 100644 --- a/arch/arm/boot/dts/msmzinc-ion.dtsi +++ b/arch/arm/boot/dts/msmzinc-ion.dtsi
@@ -20,6 +20,10 @@ reg = <30>; }; + qcom,ion-heap@21 { /* SYSTEM CONTIG HEAP */ + reg = <21>; + }; + qcom,ion-heap@25 { /* IOMMU HEAP */ reg = <25>; };