aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042-x86ia64io.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-04 02:42:00 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-04 02:42:00 -0400
commit945ef0d428bc33c639e49d27fb8cc765adec3fdf (patch)
tree0bcd9222a42b61081015419276d6aaa731e3ee3b /drivers/input/serio/i8042-x86ia64io.h
parentc3d31e7f9a94800ba895a081e143e79954f6c62f (diff)
Input: i8042 - add i8042.nokbd module option to allow supressing
creation of keyboard port. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 84a73bc6afdc..d5ea3cf09469 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -297,6 +297,8 @@ static int __init i8042_pnp_init(void)
297 aux_irq_str); 297 aux_irq_str);
298 298
299#if defined(__ia64__) 299#if defined(__ia64__)
300 if (result_kbd <= 0)
301 i8042_nokbd = 1;
300 if (result_aux <= 0) 302 if (result_aux <= 0)
301 i8042_noaux = 1; 303 i8042_noaux = 1;
302#endif 304#endif
@@ -315,7 +317,7 @@ static int __init i8042_pnp_init(void)
315 i8042_pnp_command_reg = i8042_command_reg; 317 i8042_pnp_command_reg = i8042_command_reg;
316 } 318 }
317 319
318 if (!i8042_pnp_kbd_irq) { 320 if (!i8042_nokbd && !i8042_pnp_kbd_irq) {
319 printk(KERN_WARNING "PNP: PS/2 controller doesn't have KBD irq; using default %d\n", i8042_kbd_irq); 321 printk(KERN_WARNING "PNP: PS/2 controller doesn't have KBD irq; using default %d\n", i8042_kbd_irq);
320 i8042_pnp_kbd_irq = i8042_kbd_irq; 322 i8042_pnp_kbd_irq = i8042_kbd_irq;
321 } 323 }