diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-02 11:18:17 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-02 11:18:17 -0300 |
commit | 53fd6cc3b7515ecc4f2e59732063c4ed7d730fd5 (patch) | |
tree | 3b8e0c938fbd6fe43d11f5d16562148402cab42a /linux | |
parent | 91a3da5165321c89bb4a35937d47f19ac53f8899 (diff) | |
download | mediapointer-dvb-s2-53fd6cc3b7515ecc4f2e59732063c4ed7d730fd5.tar.gz mediapointer-dvb-s2-53fd6cc3b7515ecc4f2e59732063c4ed7d730fd5.tar.bz2 |
Reverted from previous patch since it is not required
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r-- | linux/include/linux/videodev2.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 6e769cdb0..5d46a8d2a 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1246,8 +1246,7 @@ extern char *v4l2_type_names[]; typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, unsigned int cmd, void *arg); -#if defined(CONFIG_VIDEO_V4L1_COMPAT) || \ - defined(CONFIG_VIDEO_V4L1_COMPAT_MODULE) +#ifdef CONFIG_VIDEO_V4L1_COMPAT int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, int cmd, void *arg, v4l2_kioctl driver_ioctl); #else |