From: Alexey Dobriyan <[email-masked]>

Fun in dmesg:

    --- dmesg-2.6.12-rc4
    +++ dmesg-2.6.12-rc4-mm1

    -PNP: PS/2 Controller [PNP0303:PS2K] at 0x60,0x64 irq 10	    <===
    +PNP: PS/2 controller doesn't have AUX irq; using default 0xc
     PNP: PS/2 Controller [PNP0303:PS2K] at 0x60,0x64 irq 112	    <======
    +serio: i8042 AUX port at 0x60,0x64 irq 12
     serio: i8042 KBD port at 0x60,0x64 irq 1			    <===

I never realized "irq 10" meant "KBD irq 1 and you don't have AUX irq". In
2.6.12-rc4-mm1 "irq 112" means "KBD irq 1 and AUX irq 12 (now assigned by
default)".

Signed-off-by: Alexey Dobriyan <[email-masked]>
Cc: Adam Belay <[email-masked]>
Cc: Vojtech Pavlik <[email-masked]>
Signed-off-by: Andrew Morton <[email-masked]>
---

 drivers/input/serio/i8042-x86ia64io.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/input/serio/i8042-x86ia64io.h~print-kbd-and-aux-irqs-correctly drivers/input/serio/i8042-x86ia64io.h
--- 25/drivers/input/serio/i8042-x86ia64io.h~print-kbd-and-aux-irqs-correctly	2005-05-31 02:43:16.000000000 -0700
+++ 25-akpm/drivers/input/serio/i8042-x86ia64io.h	2005-05-31 02:43:16.000000000 -0700
@@ -300,10 +300,10 @@ static int i8042_pnp_init(void)
 	i8042_kbd_irq = i8042_pnp_kbd_irq;
 	i8042_aux_irq = i8042_pnp_aux_irq;
 
-	printk(KERN_INFO "PNP: PS/2 Controller [%s%s%s] at %#x,%#x irq %d%s%d\n",
+	printk(KERN_INFO "PNP: PS/2 Controller [%s%s%s] at %#x,%#x irq %d,%d\n",
 		i8042_pnp_kbd_name, (result_kbd > 0 && result_aux > 0) ? "," : "", i8042_pnp_aux_name,
 		i8042_data_reg, i8042_command_reg, i8042_kbd_irq,
-		(result_aux > 0) ? "," : "", i8042_aux_irq);
+		i8042_aux_irq);
 
 	return 0;
 }
_