| commit | c63c08fafebd9b26729c4a4986099c0b93120b3b | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Mar 28 02:35:47 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Mar 28 02:35:46 2013 -0700 |
| tree | b7499f9a803af5831b79a9adb202cc2c512d1c95 | |
| parent | 3e57e3135ceb012bf09587c0c1c1d04953e5a915 [diff] | |
| parent | 3028c380d3c3d7a1cd0c52d696481e863e817534 [diff] |
Merge "arm/dt: msm8974: Fix address of diag buffer"
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi index 2ecfc74..7557657 100644 --- a/arch/arm/boot/dts/msm8974.dtsi +++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -1117,9 +1117,9 @@ qcom,ipi-ping; }; - qcom,tz-log@fc03000 { + qcom,tz-log@fe805720 { compatible = "qcom,tz-log"; - reg = <0x0fc03000 0x1000>; + reg = <0xfe805720 0x1000>; }; qcom,venus@fdce0000 {