diff --git a/[refs] b/[refs]
index 077be30987f8..a5e00fd2905f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cec69c376be132a6afdc55b8090a389eaa3cd770
+refs/heads/master: c18bab80d16f04db3e263cc97522d21693cad2ce
diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c
index 1f73cf72a7c5..2763394869d2 100644
--- a/trunk/drivers/input/serio/i8042.c
+++ b/trunk/drivers/input/serio/i8042.c
@@ -1172,14 +1172,14 @@ static int __devinit i8042_probe(struct platform_device *dev)
 		if (error)
 			goto out_fail;
 	}
-
+#ifdef CONFIG_X86
 	if (i8042_dritek) {
 		param = 0x90;
 		error = i8042_command(&param, 0x1059);
 		if (error)
 			goto out_fail;
 	}
-
+#endif
 /*
  * Ok, everything is ready, let's register all serio ports
  */