OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d63cec
)
V4L/DVB (11612): mx3_camera: Fix compilation with CONFIG_PM
author
Sascha Hauer
<s.hauer@pengutronix.de>
Fri, 24 Apr 2009 15:58:24 +0000
(12:58 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Wed, 29 Apr 2009 18:59:24 +0000
(15:59 -0300)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/mx3_camera.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/mx3_camera.c
b/drivers/media/video/mx3_camera.c
index
c462b81
..
2d07811
100644
(file)
--- a/
drivers/media/video/mx3_camera.c
+++ b/
drivers/media/video/mx3_camera.c
@@
-1063,10
+1063,6
@@
static struct soc_camera_host_ops mx3_soc_camera_host_ops = {
.owner = THIS_MODULE,
.add = mx3_camera_add_device,
.remove = mx3_camera_remove_device,
-#ifdef CONFIG_PM
- .suspend = mx3_camera_suspend,
- .resume = mx3_camera_resume,
-#endif
.set_crop = mx3_camera_set_crop,
.set_fmt = mx3_camera_set_fmt,
.try_fmt = mx3_camera_try_fmt,