summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pxa_camera.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-18 09:46:12 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-08-18 09:46:12 +0200
commit2315f8eef1304343666da0b452b8ec290aa32132 (patch)
tree6210a21449cd6f25fe71c303959eaba4ef58a820 /linux/drivers/media/video/pxa_camera.c
parent58df9dfb0cd0e6afde3ae7a49f84d4f216bc3cbf (diff)
downloadmediapointer-dvb-s2-2315f8eef1304343666da0b452b8ec290aa32132.tar.gz
mediapointer-dvb-s2-2315f8eef1304343666da0b452b8ec290aa32132.tar.bz2
pxa: fix build error for 2.6.27.
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/pxa_camera.c')
-rw-r--r--linux/drivers/media/video/pxa_camera.c5
1 files changed, 5 insertions, 0 deletions
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"