Merge branch 'x86/fpu' into x86/urgent

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / trackpoint.c

diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 9ab5b5ea809d1a9c00820dd4937d6419be1e9733..26b845fc186ab7557635d6eafe59c7970c3507cc 100644 (file)
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -11,7 +11,6 @@
 #include <linux/delay.h>
 #include <linux/serio.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/input.h>
 #include <linux/libps2.h>
 #include <linux/proc_fs.h>