The patch number 12331 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/pxa_camera.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r 1ce5a8f9995d -r 34709800ea6d linux/drivers/media/video/pxa_camera.c
--- a/linux/drivers/media/video/pxa_camera.c Fri Jul 24 16:06:02 2009 -0300
+++ b/linux/drivers/media/video/pxa_camera.c Fri Jul 24 16:07:41 2009 -0300
@@ -1591,6 +1591,7 @@ static int __devinit pxa_camera_probe(st
pcdev->mclk = 20000000;
}
+ pcdev->soc_host.dev = &pdev->dev;
pcdev->mclk_divisor = mclk_get_divisor(pcdev);
INIT_LIST_HEAD(&pcdev->capture);
@@ -1656,7 +1657,6 @@ static int __devinit pxa_camera_probe(st
pcdev->soc_host.drv_name = PXA_CAM_DRV_NAME;
pcdev->soc_host.ops = &pxa_soc_camera_host_ops;
pcdev->soc_host.priv = pcdev;
- pcdev->soc_host.dev = &pdev->dev;
pcdev->soc_host.nr = pdev->id;
err = soc_camera_host_register(&pcdev->soc_host);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/34709800ea6de8d9052110545379b58720fb4abb
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
