| commit | ee96b06bbb4e3c3c17bcd266e23093ac416dc806 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Jul 25 17:12:49 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Jul 25 17:12:48 2013 -0700 |
| tree | 4ca868b33fd5ec6fb3db4a3a15cd3fa5107f4c59 | |
| parent | 087f5221fbe5398c420494654f040003ef1a6dc3 [diff] | |
| parent | 61f7ca91df959393163780dee10bce5c74ed65a8 [diff] |
Merge "ARM: dts: msm: use correct sensor device tree for msm8926 QRD"
diff --git a/arch/arm/boot/dts/msm8926-qrd.dts b/arch/arm/boot/dts/msm8926-qrd.dts index 8497ba2..e056b7e 100644 --- a/arch/arm/boot/dts/msm8926-qrd.dts +++ b/arch/arm/boot/dts/msm8926-qrd.dts
@@ -13,7 +13,6 @@ /dts-v1/; /include/ "msm8926.dtsi" /include/ "msm8226-qrd.dtsi" -/include/ "msm8226-camera-sensor-cdp.dtsi" / { model = "Qualcomm MSM 8926 QRD";