2005-05-29 05:01:19

by Dmitry Torokhov

[permalink] [raw]
Subject: [patch 03/13] i8042: try AUX (on x86) even if PNP only reports KBD

From: Vojtech Pavlik <[email protected]>

Input: Add a missing KERN_INFO message designation, fix behavior
when only a keyboard part of the controller is detected.

Signed-off-by: Vojtech Pavlik <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---

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

Index: work/drivers/input/serio/i8042-x86ia64io.h
===================================================================
--- work.orig/drivers/input/serio/i8042-x86ia64io.h
+++ work/drivers/input/serio/i8042-x86ia64io.h
@@ -227,7 +227,7 @@ static int i8042_pnp_init(void)
int result_kbd, result_aux;

if (i8042_nopnp) {
- printk("i8042: PNP detection disabled\n");
+ printk(KERN_INFO "i8042: PNP detection disabled\n");
return 0;
}

@@ -265,7 +265,7 @@ static int i8042_pnp_init(void)
i8042_pnp_kbd_irq = i8042_kbd_irq;
}

- if (result_aux > 0 && !i8042_pnp_aux_irq) {
+ if (!i8042_pnp_aux_irq) {
printk(KERN_WARNING "PNP: PS/2 controller doesn't have AUX irq; using default %#x\n", i8042_aux_irq);
i8042_pnp_aux_irq = i8042_aux_irq;
}