diff options
| author | Vojtech Pavlik <vojtech@suse.cz> | 2005-05-28 02:11:16 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-05-28 02:11:16 -0500 |
| commit | 39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff (patch) | |
| tree | 78ccf7229589e3ff2a216b758562440e8d0fe602 /drivers/input | |
| parent | 668d1e6093110f7534e661e2ff43d54c74659b6d (diff) | |
| download | blackbird-op-linux-39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff.tar.gz blackbird-op-linux-39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff.zip | |
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 <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index f64867808fea..0327472393de 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/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; } |
