diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-03 11:03:43 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-03 11:03:43 -0200 |
| commit | 2845b6ea98750e41a74dfec914ddec75b7f267de (patch) | |
| tree | e68238179bb7035363de2c3ae14c39fc0a401736 /linux/drivers/media/video/pxa_camera.c | |
| parent | f8af0e5f8318f45110ce1d5e7d4441fcfda47d4a (diff) | |
| download | mediapointer-dvb-s2-2845b6ea98750e41a74dfec914ddec75b7f267de.tar.gz mediapointer-dvb-s2-2845b6ea98750e41a74dfec914ddec75b7f267de.tar.bz2 | |
backport commit 013132cae84a36df8a88773a3e0391700d0a66d4
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Author: Eric Miao <eric.miao@marvell.com>
Date: Fri Nov 28 09:16:52 2008 +0800
[ARM] pxa: move camera (QCI) registers definition out of pxa-regs.h
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pxa_camera.c')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c index bb151032b..fd2412c95 100644 --- a/linux/drivers/media/video/pxa_camera.c +++ b/linux/drivers/media/video/pxa_camera.c @@ -43,6 +43,8 @@ #include <asm/arch/camera.h> #endif +#include "pxa_camera.h" + #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) #define PXA_CAM_DRV_NAME "pxa27x-camera" @@ -1407,7 +1409,7 @@ static int pxa_camera_probe(struct platform_device *pdev) goto exit; } - pcdev->clk = clk_get(&pdev->dev, "CAMCLK"); + pcdev->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(pcdev->clk)) { err = PTR_ERR(pcdev->clk); goto exit_kfree; |