@@ -1,6 +1,8 @@
#ifndef _I8042_X86IA64IO_H
#define _I8042_X86IA64IO_H
+#include <linux/acpi.h>
+
/*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published by
@@ -744,12 +746,16 @@ static int __init i8042_pnp_init(void)
if (!i8042_pnp_kbd_devices && !i8042_pnp_aux_devices) {
i8042_pnp_exit();
-#if defined(__ia64__)
- return -ENODEV;
-#else
+
+ /* Non-ACPI systems are much less likely to have the
+ * KBC declared via PNP, so if acpi is disabled fall
+ * back to banging the ports directly */
+
+ if (!acpi_disabled)
+ return -ENODEV;
+
printk(KERN_INFO "PNP: No PS/2 controller found. Probing ports directly.\n");
return 0;
-#endif
}
if (i8042_pnp_kbd_devices)