summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/pxa_camera.c6
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"