diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
| commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
| tree | edfd028285e21ba549d047c0caa4ffe523272f94 /drivers/media/video/vino.c | |
| parent | e4856a70cfc23266631a78e78277cf2b195babee (diff) | |
| parent | 118a9069f06ff591d51a3133e242f0c256ba2db7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: remove CONFIG_KMOD in comment after #endif
remove CONFIG_KMOD from fs
remove CONFIG_KMOD from drivers
Manually fix conflict due to include cleanups in drivers/md/md.c
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 8ec57df1904..1efc5f3462c 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 |