From 41dbb5cfa363feba7ba45e3bc00d1d76cc03bb7a Mon Sep 17 00:00:00 2001
From: Bruce Duncan <B.W.Duncan@sms.ed.ac.uk>
Date: Wed, 30 Jan 2008 16:34:34 -0500
Subject: [PATCH] --- yaml --- r: 84352 b: refs/heads/master c:
 b4d62de16283d096e2e0dfe9d3395f5ba1b1352e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 79380011f368..944bc5d0d610 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5799ddb54e829c92b23b7a3bf5133923cb908116
+refs/heads/master: b4d62de16283d096e2e0dfe9d3395f5ba1b1352e
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index 0ceb84dc90fc..9efb90b52e32 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/drivers/input/serio/i8042-x86ia64io.h
@@ -63,7 +63,7 @@ static inline void i8042_write_command(int val)
 	outb(val, I8042_COMMAND_REG);
 }
 
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 
 #include <linux/dmi.h>
 
@@ -563,7 +563,7 @@ static int __init i8042_platform_init(void)
         i8042_reset = 1;
 #endif
 
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 	if (dmi_check_system(i8042_dmi_noloop_table))
 		i8042_noloop = 1;