From: Andrew Morton <akpm@osdl.org>

A trainwreck.

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/videodev2.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN include/linux/videodev2.h~git-dvb-Kconfig-fix-2 include/linux/videodev2.h
--- 25/include/linux/videodev2.h~git-dvb-Kconfig-fix-2	2006-04-26 23:29:11.000000000 -0700
+++ 25-akpm/include/linux/videodev2.h	2006-04-26 23:29:34.000000000 -0700
@@ -1141,7 +1141,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
_