mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: feng.tang@intel.com
To: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@elte.hu,
	hpa@zytor.com, jacob.jun.pan@intel.com, dtor@mail.ru,
	randy.dunlap@oracle.com
Cc: Feng Tang <feng.tang@intel.com>
Subject: [PATCH 4/5] Revert "Input: fixup X86_MRST selects"
Date: Fri,  2 Jul 2010 16:35:15 +0800	[thread overview]
Message-ID: <1278059716-7147-5-git-send-email-feng.tang@intel.com> (raw)
In-Reply-To: <1278059716-7147-1-git-send-email-feng.tang@intel.com>

From: Feng Tang <feng.tang@intel.com>

This reverts commit 0b28bac5aef7bd1ab213723df031e61db9ff151a.

After adding x86_platform's detection for i8042 controller, we
don't need the force dependency on !X86_MRST any more

Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
 drivers/input/keyboard/Kconfig |    2 +-
 drivers/input/serio/Kconfig    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 917eec3..3525f53 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 || X86_MRST
+	tristate "AT keyboard" if EMBEDDED || !X86
 	default y
 	select SERIO
 	select SERIO_LIBPS2
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 256b9e9..3bfe8fa 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 && !X86_MRST
+		   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
 	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,
-- 
1.7.0.4


  parent reply	other threads:[~2010-07-02  8:17 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-02  8:35 [PATCH 0/5] patches to settle i8042 with Intel MID platforms feng.tang
2010-07-02  8:35 ` [PATCH 1/5] x86: add i8042 pre-detection hook to x86_platform_ops feng.tang
2010-07-02  8:35 ` [PATCH 2/5] x86, mrst: add i8042_detect API for Moorestwon platform feng.tang
2010-07-02  8:35 ` [PATCH 3/5] Revert "Input: do not force selecting i8042 on Moorestown" feng.tang
2010-07-02  8:35 ` feng.tang [this message]
2010-07-02  8:35 ` [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init feng.tang
2010-07-02 16:59   ` Dmitry Torokhov
2010-07-02 20:53   ` Thomas Gleixner
2010-07-02 20:58     ` H. Peter Anvin
2010-07-08 20:11       ` Luck, Tony

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1278059716-7147-5-git-send-email-feng.tang@intel.com \
    --to=feng.tang@intel.com \
    --cc=dtor@mail.ru \
    --cc=hpa@zytor.com \
    --cc=jacob.jun.pan@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=randy.dunlap@oracle.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®