From d2489659f143060af58c645810e9c8596eded9f1 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 5 Jan 2009 21:41:08 -0200
Subject: [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>
---
 linux/drivers/media/video/pxa_camera.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linux')

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"
 
-- 
cgit v1.2.3