Merge branch 'linus' into x86/nmi

[linux-2.6] / drivers / input / misc / keyspan_remote.c

diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 86ddd72dbe3d1a19121c67a04fd0e57bcd7040a2..952938a8e99102e5b16aca929c3e85e6486eb87e 100644 (file)
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/usb/input.h>
 
 #define DRIVER_VERSION "v0.1"