Prev: jump label v9: base patch
Next: PCI: hotplug/cpqphp, fix NULL dereference
From: Randy Dunlap on 9 Jun 2010 18:40
From: Randy Dunlap <randy.dunlap(a)oracle.com>

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.

Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com>
Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Cc: Jacob Pan <jacob.jun.pan(a)intel.com>
---
[found in linux-next but also applies to mainline]

drivers/input/keyboard/Kconfig | 3 ++-
drivers/input/mouse/Kconfig | 2 +-
drivers/input/serio/Kconfig | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)

--- linux-next-20100609.orig/drivers/input/keyboard/Kconfig
+++ linux-next-20100609/drivers/input/keyboard/Kconfig
@@ -70,9 +70,10 @@ config KEYBOARD_ATARI

config KEYBOARD_ATKBD
tristate "AT keyboard" if EMBEDDED || !X86
+ depends on !X86 || (X86 && !X86_MRST)
default y
select SERIO
- select SERIO_LIBPS2
+ select SERIO_LIBPS2 if !X86_MRST
select SERIO_I8042 if X86 && !X86_MRST
select SERIO_GSCPS2 if GSC
help
--- linux-next-20100609.orig/drivers/input/mouse/Kconfig
+++ linux-next-20100609/drivers/input/mouse/Kconfig
@@ -16,7 +16,7 @@ config MOUSE_PS2
tristate "PS/2 mouse"
default y
select SERIO
- select SERIO_LIBPS2
+ select SERIO_LIBPS2 if !X86_MRST
select SERIO_I8042 if X86 && !X86_MRST
select SERIO_GSCPS2 if GSC
help
--- linux-next-20100609.orig/drivers/input/serio/Kconfig
+++ linux-next-20100609/drivers/input/serio/Kconfig
@@ -168,7 +168,7 @@ config SERIO_MACEPS2
module will be called maceps2.

config SERIO_LIBPS2
- tristate "PS/2 driver library" if EMBEDDED
+ tristate "PS/2 driver library" if EMBEDDED && !X86_MRST
depends on SERIO_I8042 || SERIO_I8042=n
help
Say Y here if you are using a driver for device connected
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: jump label v9: base patch
Next: PCI: hotplug/cpqphp, fix NULL dereference