From patchwork Thu Jun 10 19:04:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 106113 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 o5F3FgeP013346 for ; Tue, 15 Jun 2010 03:15:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750784Ab0FODPk (ORCPT ); Mon, 14 Jun 2010 23:15:40 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:48161 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744Ab0FODPj (ORCPT ); Mon, 14 Jun 2010 23:15:39 -0400 Received: by pvg16 with SMTP id 16so3207022pvg.19 for ; Mon, 14 Jun 2010 20:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=LTydSZ05spoUx1VGhZbBsKbhi9OPG1Dk2JolB7feR+w=; b=csL989wxIWPE6EJwso66NuUsCoKb+7pVwrFHJEAhnKU2JEkWC3aNHBa6ZfET8aqqZq h9XyM7SpAJlOrnvx6+A72u3dyAqY0aXQllQzYONABBlwwsgyWeqIocOQ1RKZ8fpIRaTL 7+wjx8gcw15CWzmGzsoE6Wb1qWUqzJlRzV6AU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=crqoicF4+ZlVJb2yz+ANg/Vme/YPitkY7sRj1MRPthfdGTJfZZm3rAEwd5VzR6bHga 6EoB1qh0goqGZI6/NWi25IuvN16vVnAcBPLdWNQlqV+HYJTtiLE8g5uYv6QIY42Z3Fo+ v7HTNbM/fqGSWxit7m0KOYPwJD4PKDc3ZtNOk= Received: by 10.142.209.3 with SMTP id h3mr4543152wfg.42.1276571738410; Mon, 14 Jun 2010 20:15:38 -0700 (PDT) Received: from mailhub.coreip.homeip.net (c-24-6-153-206.hsd1.ca.comcast.net [24.6.153.206]) by mx.google.com with ESMTPS id g14sm5346844rvb.13.2010.06.14.20.15.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 14 Jun 2010 20:15:36 -0700 (PDT) From: Dmitry Torokhov To: Randy Dunlap Subject: Re: [PATCH] input: fixup X86_MRST selects Date: Thu, 10 Jun 2010 12:04:45 -0700 User-Agent: KMail/1.13.3 (Linux/2.6.35-rc2+; KDE/4.4.3; x86_64; ; ) Cc: Stephen Rothwell , Jacob Pan , linux-next@vger.kernel.org, LKML , linux-input@vger.kernel.org, akpm References: <20100609133443.38f1f957.sfr@canb.auug.org.au> <201006091540.43122.dmitry.torokhov@gmail.com> <4C1018C0.6020304@oracle.com> In-Reply-To: <4C1018C0.6020304@oracle.com> MIME-Version: 1.0 Message-Id: <201006101204.45709.dmitry.torokhov@gmail.com> 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]); Tue, 15 Jun 2010 03:15:42 +0000 (UTC) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 9522b89..d3a99de 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -69,7 +69,7 @@ config KEYBOARD_ATARI module will be called atakbd. config KEYBOARD_ATKBD - tristate "AT keyboard" if EMBEDDED || !X86 + tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST default y select SERIO select SERIO_LIBPS2 diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 3bfe8fa..256b9e9 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -22,7 +22,7 @@ config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN + (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST help i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices,