From 53fd6cc3b7515ecc4f2e59732063c4ed7d730fd5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 2 May 2006 11:18:17 -0300 Subject: Reverted from previous patch since it is not required From: Mauro Carvalho Chehab kernel-sync: Signed-off-by: Mauro Carvalho Chehab --- linux/include/linux/videodev2.h | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3