linux-kernel - [tip:x86/urgent] Revert "Input: fixup X86

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb@git.kernel.org>
Date:	Thu, 8 Jul 2010 07:16:56 GMT
From:	tip-bot for Feng Tang <feng.tang@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	randy.dunlap@...cle.com, dtor@...l.ru, tglx@...utronix.de,
	feng.tang@...el.com, hpa@...ux.intel.com
Subject: [tip:x86/urgent] Revert "Input: fixup X86_MRST selects"

Commit-ID:  c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb
Gitweb:     http://git.kernel.org/tip/c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb
Author:     Feng Tang <feng.tang@...el.com>
AuthorDate: Mon, 5 Jul 2010 23:03:21 +0800
Committer:  H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Wed, 7 Jul 2010 17:05:07 -0700

Revert "Input: fixup X86_MRST selects"

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@...cle.com>
Signed-off-by: Feng Tang <feng.tang@...el.com>
LKML-Reference: <1278342202-10973-5-git-send-email-feng.tang@...el.com>
Acked-by: Dmitry Torokhov <dtor@...l.ru>
Signed-off-by: H. Peter Anvin <hpa@...ux.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,
--
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/