diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 10:00:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 10:00:59 -0300 |
| commit | 9c3b1614a4ba753d7ccc8f1861950504ab1dc6e5 (patch) | |
| tree | 697737dc6d416e0a80e3058378aeb60390fa544d /linux/drivers/media/video/meye.h | |
| parent | 0f65d0ff00289bf9ccb53c0b6acb63eb0e6f2984 (diff) | |
| download | mediapointer-dvb-s2-9c3b1614a4ba753d7ccc8f1861950504ab1dc6e5.tar.gz mediapointer-dvb-s2-9c3b1614a4ba753d7ccc8f1861950504ab1dc6e5.tar.bz2 | |
backport commit cbefb762b67fa6d3eb2a48ae3380358a940e8c9d
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Backport the original patch from Mattia Dongili <malattia@linux.it>
meye: make meye use sony-laptop instead of sonypi
Change sonypi_camera_command() calls to sony_pic_camera_command() and use
the renamed macros.
Also, added compat stuff to allow compiling meye driver for kernels < 2.6.22
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/meye.h')
| -rw-r--r-- | linux/drivers/media/video/meye.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/meye.h b/linux/drivers/media/video/meye.h index d6306af94..fdba6226e 100644 --- a/linux/drivers/media/video/meye.h +++ b/linux/drivers/media/video/meye.h @@ -255,7 +255,11 @@ /****************************************************************************/ /* Sony Programmable I/O Controller for accessing the camera commands */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21) +#include <linux/sony-laptop.h> +#else #include <linux/sonypi.h> +#endif /* private API definitions */ #include <linux/meye.h> |