Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261238AbVE2FBT (ORCPT ); Sun, 29 May 2005 01:01:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261253AbVE2FBT (ORCPT ); Sun, 29 May 2005 01:01:19 -0400 Received: from smtp826.mail.sc5.yahoo.com ([66.163.171.13]:882 "HELO smtp826.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S261238AbVE2FBI (ORCPT ); Sun, 29 May 2005 01:01:08 -0400 Message-Id: <20050529045846.909849000.dtor_core@ameritech.net> References: <20050529044813.711249000.dtor_core@ameritech.net> Date: Sat, 28 May 2005 23:48:16 -0500 From: Dmitry Torokhov To: Linus Torvalds Cc: Vojtech Pavlik , Andrew Morton , linux-kernel@vger.kernel.org Subject: [patch 03/13] i8042: try AUX (on x86) even if PNP only reports KBD Content-Disposition: inline; filename=i8042-aux-detection.patch Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1376 Lines: 40 From: Vojtech Pavlik 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 Signed-off-by: Dmitry Torokhov --- 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; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/