From 82952b23500fff65871d254f64dc6b96eb13785c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 14 Apr 2009 08:50:00 -0300
Subject: backport arch arm/sh changes that affected v4l

From: Mauro Carvalho Chehab <mchehab@redhat.com>

kernel-sync:

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 linux/drivers/media/video/pxa_camera.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux/drivers/media/video')

diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c
index 98825d631..cb4491338 100644
--- a/linux/drivers/media/video/pxa_camera.c
+++ b/linux/drivers/media/video/pxa_camera.c
@@ -40,7 +40,9 @@
 #include <asm/dma.h>
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 #include <mach/pxa-regs.h>
+#endif
 #include <mach/camera.h>
 #else
 #include <asm/arch/pxa-regs.h>
-- 
cgit v1.2.3