| 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
| ||
|
Message-ID: <tip-44631ac64d06d2f7ce006c2a6f2c8e003a9c6ace@git.kernel.org> Date: Thu, 8 Jul 2010 07:16:38 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, dtor@...l.ru, tglx@...utronix.de, feng.tang@...el.com, jacob.jun.pan@...ux.intel.com, hpa@...ux.intel.com Subject: [tip:x86/urgent] Revert "Input: do not force selecting i8042 on Moorestown" Commit-ID: 44631ac64d06d2f7ce006c2a6f2c8e003a9c6ace Gitweb: http://git.kernel.org/tip/44631ac64d06d2f7ce006c2a6f2c8e003a9c6ace Author: Feng Tang <feng.tang@...el.com> AuthorDate: Mon, 5 Jul 2010 23:03:20 +0800 Committer: H. Peter Anvin <hpa@...ux.intel.com> CommitDate: Wed, 7 Jul 2010 17:05:06 -0700 Revert "Input: do not force selecting i8042 on Moorestown" This reverts commit 685afae02557a178185a4be36f58332976e79f63. After adding x86_platform's detection for i8042 controller, we don't need the force dependency on !X86_MRST any more Cc: Jacob Pan <jacob.jun.pan@...ux.intel.com> Signed-off-by: Feng Tang <feng.tang@...el.com> LKML-Reference: <1278342202-10973-4-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/mouse/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 0f9a478..917eec3 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -73,7 +73,7 @@ config KEYBOARD_ATKBD default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 && !X86_MRST + select SERIO_I8042 if X86 select SERIO_GSCPS2 if GSC help Say Y here if you want to use a standard AT or PS/2 keyboard. Usually diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index eeb58c1..c714ca2 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -17,7 +17,7 @@ config MOUSE_PS2 default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 && !X86_MRST + select SERIO_I8042 if X86 select SERIO_GSCPS2 if GSC help Say Y here if you have a PS/2 mouse connected to your system. This -- 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/
Powered by blists - more mailing lists