[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.00.1005171352010.4195@i5.linux-foundation.org>
Date: Mon, 17 May 2010 13:52:39 -0700 (PDT)
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Matthew Garrett <mjg@...hat.com>
cc: linux-input@...r.kernel.org, dmitry.torokhov@...il.com,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH V2 3/3] input: Default to only using PNP for i8042 probing
on x86
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists