git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omap_vout: fix compiler warning
[pandora-kernel.git]
/
drivers
/
media
/
video
/
via-camera.c
diff --git
a/drivers/media/video/via-camera.c
b/drivers/media/video/via-camera.c
index
bb7f17f
..
cbf13d0
100644
(file)
--- 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 <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>
#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 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
*/
/*
* GPIO info for power/reset management
*/