On Mon, 17 May 2010, Matthew Garrett wrote: > @@ -744,9 +746,10 @@ 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 > + > + if (!acpi_disabled) > + return -ENODEV; > + > printk(KERN_INFO "PNP: No PS/2 controller found. Probing ports directly.\n"); > return 0; > #endif This can't be right. That #endif is still there. How could this even compile? Tssk, tssk. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html