diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 23:17:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 23:17:07 +0200 |
| commit | 9696cc90071e3660ec02a3728acdedb68afdce4c (patch) | |
| tree | 99783d31dd42262c29346c92760f7896c3d81cb6 /drivers/media/video/via-camera.c | |
| parent | c28b56b1d46b1bbb1be33c8f2632a88b0de1ef68 (diff) | |
| parent | e3cba3243eb853a052613c804dea033bc4c9cf2d (diff) | |
| download | blackbird-op-linux-9696cc90071e3660ec02a3728acdedb68afdce4c.tar.gz blackbird-op-linux-9696cc90071e3660ec02a3728acdedb68afdce4c.zip | |
Merge branch 'pm-qos' into pm-for-linus
* pm-qos:
PM / QoS: Update Documentation for the pm_qos and dev_pm_qos frameworks
PM / QoS: Add function dev_pm_qos_read_value() (v3)
PM QoS: Add global notification mechanism for device constraints
PM QoS: Implement per-device PM QoS constraints
PM QoS: Generalize and export constraints management code
PM QoS: Reorganize data structs
PM QoS: Code reorganization
PM QoS: Minor clean-ups
PM QoS: Move and rename the implementation files
Diffstat (limited to 'drivers/media/video/via-camera.c')
| -rw-r--r-- | drivers/media/video/via-camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index bb7f17f2a33c..cbf13d09b4ac 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c @@ -21,7 +21,7 @@ #include <media/videobuf-dma-sg.h> #include <linux/delay.h> #include <linux/dma-mapping.h> -#include <linux/pm_qos_params.h> +#include <linux/pm_qos.h> #include <linux/via-core.h> #include <linux/via-gpio.h> #include <linux/via_i2c.h> @@ -69,7 +69,7 @@ struct via_camera { struct mutex lock; enum viacam_opstate opstate; unsigned long flags; - struct pm_qos_request_list qos_request; + struct pm_qos_request qos_request; /* * GPIO info for power/reset management */ |
