From fed13d770bdcffb4223b81c7006850e297d95b76 Mon Sep 17 00:00:00 2001 From: Vojtech Pavlik Date: Sat, 28 May 2005 02:11:16 -0500 Subject: [PATCH] --- yaml --- r: 1659 b: refs/heads/master c: 39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff h: refs/heads/master i: 1657: d416dba1dc396c8e9674c8637b8466b7efd063c7 1655: 1f3c5af6175cb25300918258dd9acef74ea822b5 v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 94bc2b246942..d9e6277ebae2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 668d1e6093110f7534e661e2ff43d54c74659b6d +refs/heads/master: 39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h index f64867808fea..0327472393de 100644 --- a/trunk/drivers/input/serio/i8042-x86ia64io.h +++ b/trunk/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; }