diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 10:30:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 10:30:04 -0300 |
| commit | 4a78e983d25641804f5c0c83b6c10e51063b7872 (patch) | |
| tree | ce0631476907751234d1d60ee9d1f72e18b30de2 /linux/drivers/media/video/meye.h | |
| parent | 2a03de082a1ec685712a48cedb06a73d5d607088 (diff) | |
| parent | 126b42f75f3d60cf024d206f8d7fb8680903cf8a (diff) | |
| download | mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.gz mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.bz2 | |
merge: http://linuxtv.org/hg/~aapot/m920x
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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> |