From e0678b881bdff045c20b051cefa3338dede8757e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 24 Apr 2009 12:58:24 -0300 Subject: [PATCH] --- yaml --- r: 144346 b: refs/heads/master c: e39c9047975f4302354c16c33eecfe59946d3fc4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx3_camera.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa081c5e3a17..ba8cdb95c09b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d63cec16829ac3600c5014d207a659df3b93c9a +refs/heads/master: e39c9047975f4302354c16c33eecfe59946d3fc4 diff --git a/trunk/drivers/media/video/mx3_camera.c b/trunk/drivers/media/video/mx3_camera.c index c462b811e994..2d0781118eb0 100644 --- a/trunk/drivers/media/video/mx3_camera.c +++ b/trunk/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,