diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 08:50:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 08:50:00 -0300 |
| commit | 82952b23500fff65871d254f64dc6b96eb13785c (patch) | |
| tree | c2163b0c68d1850db93f865033bf3bba9b403969 /linux/drivers | |
| parent | 5f440364b00d970a4550481eee1cde036014c44b (diff) | |
| download | mediapointer-dvb-s2-82952b23500fff65871d254f64dc6b96eb13785c.tar.gz mediapointer-dvb-s2-82952b23500fff65871d254f64dc6b96eb13785c.tar.bz2 | |
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>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 2 |
1 files changed, 2 insertions, 0 deletions
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> |