From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>,
Jacob Pan <jacob.jun.pan@intel•com>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
linux-input@vger•kernel.org, akpm <akpm@linux-foundation•org>
Subject: [PATCH] input: fixup X86_MRST selects
Date: Wed, 9 Jun 2010 15:29:21 -0700 [thread overview]
Message-ID: <20100609152921.61fb7db9.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100609133443.38f1f957.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@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@oracle•com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: Jacob Pan <jacob.jun.pan@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
next prev parent reply other threads:[~2010-06-09 22:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 3:34 linux-next: Tree for June 9 Stephen Rothwell
2010-06-09 17:36 ` linux-next: Tree for June 9 (niu) Randy Dunlap
2010-06-09 18:06 ` David Miller
2010-06-09 18:08 ` Randy Dunlap
2010-06-09 22:44 ` [PATCH 1/2 -next] of_device.h: provide struct of_device even when not enabled Randy Dunlap
2010-06-09 23:47 ` Grant Likely
2010-06-09 22:44 ` [PATCH 2/2 -next] niu: always include of_device.h Randy Dunlap
2010-06-09 23:45 ` Grant Likely
2010-06-10 0:29 ` David Miller
2010-06-09 22:29 ` Randy Dunlap [this message]
2010-06-09 22:40 ` [PATCH] input: fixup X86_MRST selects Dmitry Torokhov
2010-06-09 22:42 ` Randy Dunlap
2010-06-10 19:04 ` Dmitry Torokhov
2010-06-15 15:17 ` Randy Dunlap
2010-06-28 19:03 ` problem: " Randy Dunlap
2010-06-28 20:18 ` Dmitry Torokhov
2010-06-28 20:23 ` Randy Dunlap
2010-06-28 21:12 ` Pan, Jacob jun
2010-06-28 22:44 ` Dmitry Torokhov
2010-06-28 23:22 ` Pan, Jacob jun
2010-07-02 4:46 ` Dmitry Torokhov
2010-07-02 6:27 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100609152921.61fb7db9.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=jacob.jun.pan@intel$(echo .)com \
--cc=linux-input@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox