diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 10:17:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 10:17:46 -0300 |
| commit | 1aadc904874b153386bc286fba17fb0f73a6e355 (patch) | |
| tree | c7be167b52bf7a8498def409a8d56fb5dbd2addd | |
| parent | 13a1f108bfa987434a7b60a33837b47dea5f50db (diff) | |
| download | mediapointer-dvb-s2-1aadc904874b153386bc286fba17fb0f73a6e355.tar.gz mediapointer-dvb-s2-1aadc904874b153386bc286fba17fb0f73a6e355.tar.bz2 | |
Git dvb Kconfig fix 2
From: Andrew Morton <akpm@osdl.org>
A trainwreck.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/include/linux/videodev2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 5d46a8d2a..6e769cdb0 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1246,7 +1246,8 @@ extern char *v4l2_type_names[]; typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, unsigned int cmd, void *arg); -#ifdef CONFIG_VIDEO_V4L1_COMPAT +#if defined(CONFIG_VIDEO_V4L1_COMPAT) || \ + defined(CONFIG_VIDEO_V4L1_COMPAT_MODULE) int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, int cmd, void *arg, v4l2_kioctl driver_ioctl); #else |