From patchwork Wed Jun 9 22:29:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 105234 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o59MVCmn026706 for ; Wed, 9 Jun 2010 22:31:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756297Ab0FIWbL (ORCPT ); Wed, 9 Jun 2010 18:31:11 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:64882 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756246Ab0FIWbK (ORCPT ); Wed, 9 Jun 2010 18:31:10 -0400 Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o59MUQ3o009470 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Jun 2010 22:30:27 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o59MUPRx017132; Wed, 9 Jun 2010 22:30:25 GMT Received: from abhmt019.oracle.com by acsmt355.oracle.com with ESMTP id 311750961276122562; Wed, 09 Jun 2010 15:29:22 -0700 Received: from chimera.site (/71.245.98.113) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 09 Jun 2010 15:29:22 -0700 Date: Wed, 9 Jun 2010 15:29:21 -0700 From: Randy Dunlap To: Stephen Rothwell , Dmitry Torokhov , Jacob Pan Cc: linux-next@vger.kernel.org, LKML , linux-input@vger.kernel.org, akpm Subject: [PATCH] input: fixup X86_MRST selects Message-Id: <20100609152921.61fb7db9.randy.dunlap@oracle.com> In-Reply-To: <20100609133443.38f1f957.sfr@canb.auug.org.au> References: <20100609133443.38f1f957.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Auth-Type: Internal IP X-Source-IP: rcsinet15.oracle.com [148.87.113.117] X-CT-RefId: str=0001.0A090208.4C101604.0021:SCFMA4539811,ss=1,fgs=0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 09 Jun 2010 22:31:12 +0000 (UTC) --- linux-next-20100609.orig/drivers/input/keyboard/Kconfig +++ linux-next-20100609/drivers/input/keyboard/Kconfig @@ -70,9 +70,10 @@ config KEYBOARD_ATARI config KEYBOARD_ATKBD tristate "AT keyboard" if EMBEDDED || !X86 + depends on !X86 || (X86 && !X86_MRST) default y select SERIO - select SERIO_LIBPS2 + select SERIO_LIBPS2 if !X86_MRST select SERIO_I8042 if X86 && !X86_MRST select SERIO_GSCPS2 if GSC help --- linux-next-20100609.orig/drivers/input/mouse/Kconfig +++ linux-next-20100609/drivers/input/mouse/Kconfig @@ -16,7 +16,7 @@ config MOUSE_PS2 tristate "PS/2 mouse" default y select SERIO - select SERIO_LIBPS2 + select SERIO_LIBPS2 if !X86_MRST select SERIO_I8042 if X86 && !X86_MRST select SERIO_GSCPS2 if GSC help --- linux-next-20100609.orig/drivers/input/serio/Kconfig +++ linux-next-20100609/drivers/input/serio/Kconfig @@ -168,7 +168,7 @@ config SERIO_MACEPS2 module will be called maceps2. config SERIO_LIBPS2 - tristate "PS/2 driver library" if EMBEDDED + tristate "PS/2 driver library" if EMBEDDED && !X86_MRST depends on SERIO_I8042 || SERIO_I8042=n help Say Y here if you are using a driver for device connected