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 @@ -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;