diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
commit | c3380942e6699ed5b3e3f37b49ceb724b7699813 (patch) | |
tree | 516d791cdfd1c7f99a29f71e1a7bba8f75af96e1 /drivers/media/video/cpia.c | |
parent | 0ffda6cca2c66e42d0ad65719f58c637ed180b05 (diff) | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'drivers/media/video/cpia.c')
-rw-r--r-- | drivers/media/video/cpia.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index c325e926de8..1798b779a25 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c @@ -39,10 +39,6 @@ #include <asm/io.h> #include <linux/mutex.h> -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif - #include "cpia.h" static int video_nr = -1; |