From ba7073ea013d1d6dd9aadb6630ace353f252c592 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Wed, 17 Oct 2012 23:55:34 -0700
Subject: [PATCH] --- yaml --- r: 346916 b: refs/heads/master c:
 197a1e96c8be5b6005145af3a4c0e45e2d651444 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/input/serio/i8042-io.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 25ee7a4d4815..2283e4483f01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad5396ee32afbdabb6188ffba67778080ea795b8
+refs/heads/master: 197a1e96c8be5b6005145af3a4c0e45e2d651444
diff --git a/trunk/drivers/input/serio/i8042-io.h b/trunk/drivers/input/serio/i8042-io.h
index 5d48bb66aa73..a5eed2ade53d 100644
--- a/trunk/drivers/input/serio/i8042-io.h
+++ b/trunk/drivers/input/serio/i8042-io.h
@@ -76,7 +76,7 @@ static inline int i8042_platform_init(void)
 	if (check_legacy_ioport(I8042_DATA_REG))
 		return -ENODEV;
 #endif
-#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__)
+#if !defined(__sh__) && !defined(__alpha__)
 	if (!request_region(I8042_DATA_REG, 16, "i8042"))
 		return -EBUSY;
 #endif