[PATCH] 2.5.24+ fix needed for non-modular video build

From: Christopher Hoover (ch@hpl.hp.com)
Date: Mon Jul 22 2002 - 15:45:14 EST

diff -X ../dontdiff.txt -Naur linux-2.5.24-rmk1/drivers/media/video/videodev.c linux-2.5.24-rmk1-ch1/drivers/media/video/videodev.c
--- linux-2.5.24-rmk1/drivers/media/video/videodev.c Thu Jun 20 15:53:45 2002
+++ linux-2.5.24-rmk1-ch1/drivers/media/video/videodev.c Tue Jul 9 15:36:53 2002
@@ -288,8 +288,6 @@
         video_dev_proc_entry->owner = THIS_MODULE;
 }
 
-#ifdef MODULE
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
 static void videodev_proc_destroy(void)
 {
         if (video_dev_proc_entry != NULL)
@@ -298,8 +296,6 @@
         if (video_proc_entry != NULL)
                 remove_proc_entry("video", &proc_root);
 }
-#endif
-#endif
 
 static void videodev_proc_create_dev (struct video_device *vfd, char *name)
 {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Tue Jul 23 2002 - 22:00:40 EST