commit 6f6746ccda79551b97a08f380ca8f0d0e6f31efe
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 17 12:18:19 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 17 12:18:19 2013 -0700
tree 362ee44e046dda3c03f52a401c38310930f7d3a2
parent b1dcc48ec5d55cface017913312360603db050b6
parent 6dd487fc8824d9d6b82e14bc1547844c5f0a1350

Merge "ARM: dts: msm: remove contiguous etr memory reservation support for 8610"

arch/arm/boot/dts/msm8610-coresight.dtsi

diff --git a/arch/arm/boot/dts/msm8610-coresight.dtsi b/arch/arm/boot/dts/msm8610-coresight.dtsi
index 84e5c31..78a4b5a 100644
--- a/arch/arm/boot/dts/msm8610-coresight.dtsi
+++ b/arch/arm/boot/dts/msm8610-coresight.dtsi
@@ -19,8 +19,6 @@
 		interrupts = <0 166 0>;
 		interrupt-names = "byte-cntr-irq";
 
-		qcom,memory-reservation-type = "EBI1";
-		qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */
 		qcom,memory-size = <0x100000>;
 
 		coresight-id = <0>;