diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2009-01-02 10:16:02 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-07 19:18:55 -0500 |
| commit | cfbaf4dfe765ae33e1a26b3eb0eda64ff00fc481 (patch) | |
| tree | c53de3e63754229994f19a08e41381936db198b4 /drivers/media/video/pxa_camera.c | |
| parent | c0cd5010e54e52931c321ee66d81d10a8e2a9ff6 (diff) | |
V4L/DVB (10176b): pxa-camera: fix redefinition warnings and missing DMA definitions
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
delete mode 100644 drivers/media/video/pxa_camera.h
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pxa_camera.c')
| -rw-r--r-- | drivers/media/video/pxa_camera.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 9d33de22cc48..a1d6008efcbb 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
| @@ -34,12 +34,10 @@ | |||
| 34 | 34 | ||
| 35 | #include <linux/videodev2.h> | 35 | #include <linux/videodev2.h> |
| 36 | 36 | ||
| 37 | #include <asm/dma.h> | 37 | #include <mach/dma.h> |
| 38 | #include <mach/pxa-regs.h> | 38 | #include <mach/pxa-regs.h> |
| 39 | #include <mach/camera.h> | 39 | #include <mach/camera.h> |
| 40 | 40 | ||
| 41 | #include "pxa_camera.h" | ||
| 42 | |||
| 43 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 41 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) |
| 44 | #define PXA_CAM_DRV_NAME "pxa27x-camera" | 42 | #define PXA_CAM_DRV_NAME "pxa27x-camera" |
| 45 | 43 | ||