Messages in this thread | | | Date | Mon, 28 Jan 2013 20:44:24 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with the input tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in drivers/input/keyboard/Kconfig between commit 6f2ac009f29b ("Input: goldfish - virtual input event driver") from the input tree and commit 4f73bc4dd3e8 ("tty: Added a CONFIG_TTY option to allow removal of TTY") from the tty tree.
I fixed it up (see below - I am not sure if GOLDFISH_EVENTS needs TTY or not) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/input/keyboard/Kconfig index 078305e,008f96a..0000000 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@@ -479,16 -482,8 +482,18 @@@ config KEYBOARD_SAMSUN To compile this driver as a module, choose M here: the module will be called samsung-keypad. + if TTY + +config KEYBOARD_GOLDFISH_EVENTS + depends on GOLDFISH + tristate "Generic Input Event device for Goldfish" + help + Say Y here to get an input event device for the Goldfish virtual + device emulator. + + To compile this driver as a module, choose M here: the + module will be called goldfish-events. + config KEYBOARD_STOWAWAY tristate "Stowaway keyboard" select SERIO [unhandled content-type:application/pgp-signature] | |