From: Linus Torvalds Subject: Re: [PATCH V2 3/3] input: Default to only using PNP for i8042 probing on x86 Date: Mon, 17 May 2010 13:52:39 -0700 (PDT) Message-ID: References: <1274110716-12488-1-git-send-email-mjg@redhat.com> <1274110716-12488-3-git-send-email-mjg@redhat.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:37636 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311Ab0EQUzb (ORCPT ); Mon, 17 May 2010 16:55:31 -0400 In-Reply-To: <1274110716-12488-3-git-send-email-mjg@redhat.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Matthew Garrett Cc: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org 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