Re: linux-next: manual merge of the tty tree with the input tree

[Greg KH]

On Mon, Jan 28, 2013 at 08:44:24PM +1100, Stephen Rothwell wrote:
> 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@xxxxxxxxxxxxxxxx
> 
> 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

Looks good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/