aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-04-10 18:20:21 -0700
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-08-30 12:12:21 -0400
commitd0becad6173e721a1c8dcd26346e6c22da32d0c4 (patch)
treee56883f15d0292445ba44403c82c781774a00c2b
parenta55f1d9933a55c48c32e5b33493c70c01e90d555 (diff)
downloadlinux-yocto-v4.8/standard/mti-malta32.tar.gz
linux-yocto-v4.8/standard/mti-malta32.tar.bz2
linux-yocto-v4.8/standard/mti-malta32.zip
Revert "Input: i8042-io - fix up region handling on MIPS"v4.8/standard/mti-malta32
This reverts commit 197a1e96c8be5b6005145af3a4c0e45e2d651444.
-rw-r--r--drivers/input/serio/i8042-io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index a5eed2ade53d..5d48bb66aa73 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/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__)
+#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__)
if (!request_region(I8042_DATA_REG, 16, "i8042"))
return -EBUSY;
#endif