diff options
Diffstat (limited to 'linux/drivers/media/video/pxa_camera.c')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c index bb151032b..2c283b82a 100644 --- a/linux/drivers/media/video/pxa_camera.c +++ b/linux/drivers/media/video/pxa_camera.c @@ -34,7 +34,11 @@ #include <linux/videodev2.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28) +#include <mach/dma.h> +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) #include <asm/dma.h> +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) #include <mach/pxa-regs.h> #include <mach/camera.h> @@ -1407,7 +1411,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; |