diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 04:28:38 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-16 11:38:35 -0400 |
commit | a65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (patch) | |
tree | 2143455a8bbcb49bbcef746e45f06e497f2eadfb /drivers/media/video/vino.c | |
parent | 04ab591808565f968d4406f6435090ad671ebdab (diff) |
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.c | 5 |
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 @@ | |||
30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
31 | #include <linux/time.h> | 31 | #include <linux/time.h> |
32 | #include <linux/version.h> | 32 | #include <linux/version.h> |
33 | |||
34 | #ifdef CONFIG_KMOD | ||
35 | #include <linux/kmod.h> | 33 | #include <linux/kmod.h> |
36 | #endif | ||
37 | 34 | ||
38 | #include <linux/i2c.h> | 35 | #include <linux/i2c.h> |
39 | #include <linux/i2c-algo-sgi.h> | 36 | #include <linux/i2c-algo-sgi.h> |
@@ -4634,7 +4631,7 @@ static int __init vino_module_init(void) | |||
4634 | } | 4631 | } |
4635 | vino_init_stage++; | 4632 | vino_init_stage++; |
4636 | 4633 | ||
4637 | #if defined(CONFIG_KMOD) && defined(MODULE) | 4634 | #ifdef MODULE |
4638 | request_module("saa7191"); | 4635 | request_module("saa7191"); |
4639 | request_module("indycam"); | 4636 | request_module("indycam"); |
4640 | #endif | 4637 | #endif |