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

Commit 0b28bac5 authored by Randy Dunlap's avatar Randy Dunlap Committed by Dmitry Torokhov
Browse files

Input: fixup X86_MRST selects 



Some of the recent X86_MRST additions make some "select"s
conditional on X86_MRST but missed some related kconfig symbols,
causing:

drivers/built-in.o: In function `ps2_end_command':
(.text+0x257ab2): undefined reference to `i8042_check_port_owner'
drivers/built-in.o: In function `ps2_end_command':
(.text+0x257ae1): undefined reference to `i8042_unlock_chip'
drivers/built-in.o: In function `ps2_begin_command':
(.text+0x257b40): undefined reference to `i8042_check_port_owner'
drivers/built-in.o: In function `ps2_begin_command':
(.text+0x257b6f): undefined reference to `i8042_lock_chip'

when SERIO_I8042=m, SERIO_LIBPS2=y, KEYBOARD_ATKBD=y.

We need to make i8042 dependant upon !X86_MRST and allow deselecting
atkbd on Moorestown even when !CONFIG_EMBEDDED.

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Jacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 0e789314

drivers/input/keyboard/Kconfig

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

drivers/input/serio/Kconfig

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