diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-23 21:35:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-23 21:35:57 -0800 |
| commit | 53d85c3a8fca105f86dcc161bc9fc3beed4619fa (patch) | |
| tree | 41c75b29b89c9c3a4bf3e5b9becb1aa792e71e05 /arch | |
| parent | d3462b27611e977213f2685490ece77c7b8223d5 (diff) | |
| parent | 05f23bfffa786367a3689f2e3be52e510c52bc22 (diff) | |
Merge "ARM: dts: msm: enable watchdog for sdm630"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630.dtsi b/arch/arm/boot/dts/qcom/sdm630.dtsi index 7ccbc1371a69..a53094c2e125 100644 --- a/arch/arm/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630.dtsi @@ -810,7 +810,6 @@ }; wdog: qcom,wdt@17817000 { - status = "disabled"; compatible = "qcom,msm-watchdog"; reg = <0x17817000 0x1000>; reg-names = "wdt-base"; |