linux-next: manual merge of the input tree with the s5p tree

[Stephen Rothwell]

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input:
samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p tree
and commit 5862c02d745f ("Input: samsung-keypad - enable compiling on
other platforms") from the input tree.

I have fixed it up (probably incorrectly - see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/input/keyboard/Kconfig
index d80b4ea,cdc385b..0000000
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -423,18 -439,12 +439,19 @@@ config KEYBOARD_PMIC8XX
  	  To compile this driver as a module, choose M here: the module will
  	  be called pmic8xxx-keypad.
  
 +config HAVE_SAMSUNG_KEYPAD
 +	bool
 +	help
 +	  This will include Samsung Keypad controller driver support. If you
 +	  want to include Samsung Keypad support for any machine, kindly
 +	  select this in the respective mach-xxxx/Kconfig file.
 +
  config KEYBOARD_SAMSUNG
  	tristate "Samsung keypad support"
- 	depends on SAMSUNG_DEV_KEYPAD || HAVE_SAMSUNG_KEYPAD
 -	depends on HAVE_CLK
++	depends on HAVE_CLK || HAVE_SAMSUNG_KEYPAD
  	help
- 	  Say Y here if you want to use the Samsung keypad.
+ 	  Say Y here if you want to use the keypad on your Samsung mobile
+ 	  device.
  
  	  To compile this driver as a module, choose M here: the
  	  module will be called samsung-keypad.

Attachment: pgp00000.pgp
Description: PGP signature