Commit b9e9691c authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] Fix for CONFIG_VIDEO_DEV=y

(Included in 2.4)
From:  Christopher Hoover <ch@hpl.hp.com>

  The #ifdef MODULE is just wrong, but both #ifdef/#endif's can be
  deleted as the code is surround by a wider #ifdef
  CONFIG_VIDEO_PROC_FS/#endif.
parent e26008f7
...@@ -288,8 +288,6 @@ static void videodev_proc_create(void) ...@@ -288,8 +288,6 @@ static void videodev_proc_create(void)
video_dev_proc_entry->owner = THIS_MODULE; video_dev_proc_entry->owner = THIS_MODULE;
} }
#ifdef MODULE
#ifdef CONFIG_VIDEO_PROC_FS
static void videodev_proc_destroy(void) static void videodev_proc_destroy(void)
{ {
if (video_dev_proc_entry != NULL) if (video_dev_proc_entry != NULL)
...@@ -298,8 +296,6 @@ static void videodev_proc_destroy(void) ...@@ -298,8 +296,6 @@ static void videodev_proc_destroy(void)
if (video_proc_entry != NULL) if (video_proc_entry != NULL)
remove_proc_entry("video", &proc_root); remove_proc_entry("video", &proc_root);
} }
#endif
#endif
static void videodev_proc_create_dev (struct video_device *vfd, char *name) static void videodev_proc_create_dev (struct video_device *vfd, char *name)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment