commit cfbaf4dfe765ae33e1a26b3eb0eda64ff00fc481
author Eric Miao <eric.y.miao@gmail.com> Fri Jan 02 12:16:02 2009 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Wed Jan 07 22:18:55 2009 -0200
tree c53de3e63754229994f19a08e41381936db198b4
parent c0cd5010e54e52931c321ee66d81d10a8e2a9ff6

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>

drivers/media/video/pxa_camera.c

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 9d33de2..a1d6008 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -34,12 +34,10 @@
 
 #include <linux/videodev2.h>
 
-#include <asm/dma.h>
+#include <mach/dma.h>
 #include <mach/pxa-regs.h>
 #include <mach/camera.h>
 
-#include "pxa_camera.h"
-
 #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
 #define PXA_CAM_DRV_NAME "pxa27x-camera"