| commit | f1df03d67c7654373f6828bfceeacbfe6e90b5ad | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Apr 24 10:41:45 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Apr 24 10:41:43 2013 -0700 |
| tree | 7ca9ca5709a1533a8f4e5b5a1c97d4f407d27e10 | |
| parent | b3d23d9fb71f6341631123648897708434180adf [diff] | |
| parent | 92cd570d561901e395058e2313b0e6b52734452c [diff] |
Merge "msm: camera2: Swap CSID and CSIPHY sensor sub modules."
diff --git a/include/media/msm_cam_sensor.h b/include/media/msm_cam_sensor.h index b71aa30..992649f 100644 --- a/include/media/msm_cam_sensor.h +++ b/include/media/msm_cam_sensor.h
@@ -108,10 +108,10 @@ SUB_MODULE_EEPROM, SUB_MODULE_LED_FLASH, SUB_MODULE_STROBE_FLASH, - SUB_MODULE_CSIPHY, - SUB_MODULE_CSIPHY_3D, SUB_MODULE_CSID, SUB_MODULE_CSID_3D, + SUB_MODULE_CSIPHY, + SUB_MODULE_CSIPHY_3D, SUB_MODULE_MAX, };