From 2315f8eef1304343666da0b452b8ec290aa32132 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 18 Aug 2008 09:46:12 +0200
Subject: pxa: fix build error for 2.6.27.

From: Hans Verkuil <hverkuil@xs4all.nl>

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 linux/drivers/media/video/pxa_camera.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linux/drivers')

diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c
index ead87ddaf..4ddd26d6c 100644
--- a/linux/drivers/media/video/pxa_camera.c
+++ b/linux/drivers/media/video/pxa_camera.c
@@ -36,8 +36,13 @@
 #include <linux/videodev2.h>
 
 #include <asm/dma.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#include <mach/pxa-regs.h>
+#include <mach/camera.h>
+#else
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/camera.h>
+#endif
 
 #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
 #define PXA_CAM_DRV_NAME "pxa27x-camera"
-- 
cgit v1.2.3