summaryrefslogtreecommitdiff
path: root/drivers/media/video/vino.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-07-09 12:28:38 +0400
committerRusty Russell <rusty@rustcorp.com.au>2008-10-16 19:38:35 +0400
commita65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (patch)
tree2143455a8bbcb49bbcef746e45f06e497f2eadfb /drivers/media/video/vino.c
parent04ab591808565f968d4406f6435090ad671ebdab (diff)
downloadlinux-a65e5d782f9db2a61a914dc01a329e0c2dcf92a1.tar.xz
remove CONFIG_KMOD from drivers
Straight forward conversions to CONFIG_MODULE; many drivers include <linux/kmod.h> conditionally and then don't have any other conditional code so remove it from those. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: video4linux-list@redhat.com Cc: David Woodhouse <dwmw2@infradead.org> Cc: linux-ppp@vger.kernel.org Cc: dm-devel@redhat.com Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r--drivers/media/video/vino.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 8ec57df1904f..1efc5f3462c6 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -30,10 +30,7 @@
#include <linux/mm.h>
#include <linux/time.h>
#include <linux/version.h>
-
-#ifdef CONFIG_KMOD
#include <linux/kmod.h>
-#endif
#include <linux/i2c.h>
#include <linux/i2c-algo-sgi.h>
@@ -4634,7 +4631,7 @@ static int __init vino_module_init(void)
}
vino_init_stage++;
-#if defined(CONFIG_KMOD) && defined(MODULE)
+#ifdef MODULE
request_module("saa7191");
request_module("indycam");
#endif