Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / media / video / cpia.c

diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 78c9699eafbbe46e791cc7c228c413b47182394c..a1d02e5ce0fda4dbcf83c8371f3f31e29abb3d6a 100644 (file)
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -28,7 +28,6 @@
 
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/vmalloc.h>