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/usbvision/usbvision-core.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/usbvision/usbvision-core.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index b26b563a0b0..9e4f5063997 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c @@ -45,10 +45,6 @@ #include <linux/workqueue.h> -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif - #include "usbvision.h" static unsigned int core_debug; |