Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44631ac6 authored by Feng Tang's avatar Feng Tang Committed by H. Peter Anvin
Browse files

Revert "Input: do not force selecting i8042 on Moorestown" 



This reverts commit 685afae0.

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@linux.intel.com>
Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
LKML-Reference: <1278342202-10973-4-git-send-email-feng.tang@intel.com>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 6d2cce62

drivers/input/keyboard/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/input/mouse/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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