diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 00:37:03 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 00:38:16 -0500 |
| commit | fe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch) | |
| tree | 8dd536be0e16e86109295142edd1ef1fd18c2e98 /drivers/media/platform/omap3isp/isp.c | |
| parent | 4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (diff) | |
| parent | 413541dd66d51f791a0b169d9b9014e4f56be13c (diff) | |
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.
Linux 3.13-rc5
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 1c3608039663..561bce8ffb1b 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c | |||
| @@ -1673,7 +1673,7 @@ void omap3isp_print_status(struct isp_device *isp) | |||
| 1673 | * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in | 1673 | * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in |
| 1674 | * resume(), and the the pipelines are restarted in complete(). | 1674 | * resume(), and the the pipelines are restarted in complete(). |
| 1675 | * | 1675 | * |
| 1676 | * TODO: PM dependencies between the ISP and sensors are not modeled explicitly | 1676 | * TODO: PM dependencies between the ISP and sensors are not modelled explicitly |
| 1677 | * yet. | 1677 | * yet. |
| 1678 | */ | 1678 | */ |
| 1679 | static int isp_pm_prepare(struct device *dev) | 1679 | static int isp_pm_prepare(struct device *dev) |