[PATCH -mm] Print KBD and AUX irqs correctly.

[Alexey Dobriyan]

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 <adobriyan@xxxxxxxxx>
---

--- linux-2.6.12-rc4-mm1/drivers/input/serio/i8042-x86ia64io.h	2005-05-12 21:22:12.000000000 +0400
+++ linux-2.6.12-rc4-mm1-pnp/drivers/input/serio/i8042-x86ia64io.h	2005-05-12 21:22:45.000000000 +0400
@@ -284,10 +284,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;
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/