linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tty tree with the input tree
@ 2013-01-28  9:44 Stephen Rothwell
  2013-01-28 14:46 ` Greg KH
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2013-01-28  9:44 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Joe Millenbach, Brian Swetland,
	Mike A. Chan, Sheng Yang, Yunhong Jiang, Xiaohui Xin,
	Jun Nakajima, Bruce Beare, Tom Keel, Alan Cox, Dmitry Torokhov

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2013-01-29  6:38 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-28  9:44 linux-next: manual merge of the tty tree with the input tree Stephen Rothwell
2013-01-28 14:46 ` Greg KH
2013-01-28 17:33   ` Dmitry Torokhov
2013-01-28 22:09     ` Joe Millenbach
2013-01-28 22:44       ` Dmitry Torokhov
2013-01-28 23:59         ` Josh Triplett
2013-01-29  0:23           ` Dmitry Torokhov
2013-01-29  5:13             ` Josh Triplett
2013-01-29  5:33               ` Dmitry Torokhov
2013-01-29  6:26                 ` Joe Millenbach
2013-01-29  6:38                   ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).