LP Bug 21558 - Thinkpad R31 requires 'i8042.nomux=1' on kernel commandline

[Leann Ogasawara]

This should resolve LP Bug 21558 - Thinkpad R31 requires 'i8042.nomux=1'
on kernel commandline.  It seems this patch accidentally didn't make
it's way into Intrepid.  It's already applied in Hardy.

commit 2d47bb38404f36aa45e0cbacf5585af05fd34857
Author: Colin Ian King <colin.king at canonical.com>
Date:   Thu May 8 15:24:29 2008 +0100

    UBUNTU: SAUCE: Blacklist IBM 2656 in serio/i8042
    Bug: #21558
    
    Fix regression for ThinkPad R31 (IBM 2656) with buggy embedded
    controller/keyboard combo chip causing erratic pointer movement.
    Blacklist IBM 2656 in seria/i8042.
    
    Signed-off-by: Colin Ian King <colin.king at canonical.com>
    Acked-by: Stefan Bader <stefan.bader at canonical.com>

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index c5e68dc..bde78a9 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -270,6 +270,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"),
 		},
 	},
+	{
+		.ident = "IBM 2656",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2656"),
+		},
+	},
 	{ }
 };