diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 3888dc3..a13039c 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -27,6 +27,10 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("i8042 keyboard and mouse controller driver");
 MODULE_LICENSE("GPL");
 
+static unsigned int i8042_disable;
+module_param_named(disable, i8042_disable, bool, 0);
+MODULE_PARM_DESC(disable, "Do not probe i8042 at all.");
+
 static unsigned int i8042_nokbd;
 module_param_named(nokbd, i8042_nokbd, bool, 0);
 MODULE_PARM_DESC(nokbd, "Do not probe or use KBD port.");
@@ -1194,6 +1198,11 @@ static int __init i8042_init(void)
 {
 	int err;
 
+	if (i8042_disable) {
+		printk(KERN_ERR "i8042.c: Controller disabled by kernel command-line\n");
+		return -ENODEV;
+	}
+
 	dbg_init();
 
 	err = i8042_platform_init();