diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-05 21:41:08 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-05 21:41:08 -0200 |
| commit | d2489659f143060af58c645810e9c8596eded9f1 (patch) | |
| tree | 1680dd00df8db917edc95ab88eb9df94071a0c55 /linux/drivers/media/video | |
| parent | 0323f6d4e7899deb91282234adf93cced54b2e7f (diff) | |
| download | mediapointer-dvb-s2-d2489659f143060af58c645810e9c8596eded9f1.tar.gz mediapointer-dvb-s2-d2489659f143060af58c645810e9c8596eded9f1.tar.bz2 | |
[PATCH] pxa-camera: fix redefinition warnings and missing DMA definitions
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Original patch applied directly into -git, since it changed also a file
at staging tree.
1. now pxa_camera.c uses ioremap() for register access, pxa_camera.h is
totally useless. Remove it.
2. <asm/dma.h> does no longer include <mach/dma.h>, include the latter
file explicitly
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c index fd2412c95..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> @@ -43,8 +47,6 @@ #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" |