* [PATCH] 2.5.24+ fix needed for non-modular video build
@ 2002-07-22 20:45 Christopher Hoover
2002-07-23 12:37 ` Dave Jones
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Hoover @ 2002-07-22 20:45 UTC (permalink / raw)
To: linux-kernel; +Cc: ch
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)
{
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] 2.5.24+ fix needed for non-modular video build
2002-07-22 20:45 [PATCH] 2.5.24+ fix needed for non-modular video build Christopher Hoover
@ 2002-07-23 12:37 ` Dave Jones
2002-07-23 17:18 ` Christopher Hoover
0 siblings, 1 reply; 3+ messages in thread
From: Dave Jones @ 2002-07-23 12:37 UTC (permalink / raw)
To: Christopher Hoover; +Cc: linux-kernel, ch
On Mon, Jul 22, 2002 at 01:45:14PM -0700, Christopher Hoover wrote:
> -#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
Why are you removing the inner ifdef too ? This looks like it
makes sense (to me at least)
Dave
--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] 2.5.24+ fix needed for non-modular video build
2002-07-23 12:37 ` Dave Jones
@ 2002-07-23 17:18 ` Christopher Hoover
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Hoover @ 2002-07-23 17:18 UTC (permalink / raw)
To: 'Dave Jones', 'Christopher Hoover'; +Cc: linux-kernel
> On Mon, Jul 22, 2002 at 01:45:14PM -0700, Christopher Hoover wrote:
>
> > -#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
>
> Why are you removing the inner ifdef too ? This looks like it
> makes sense (to me at least)
It makes sense but it is redundant -- there is a wider-scoped ifdef in
the file that catches that function and others.
-ch
mailto:ch@murgatroid.com
mailto:ch@hpl.hp.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-07-23 17:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-07-22 20:45 [PATCH] 2.5.24+ fix needed for non-modular video build Christopher Hoover
2002-07-23 12:37 ` Dave Jones
2002-07-23 17:18 ` Christopher Hoover
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.