Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 25 Aug 2010 11:22:36 +1000

Hi Matthew,

Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/Kconfig between commit
c76a3e1d6c52c5cc1371f1abc7381c5715ebdf7f ("ACPI_TOSHIBA needs LEDS
support") from Lunus' tree and commit
35989e9d7e19deb4b395aee7d120b1536337b4af ("toshiba-acpi - switch to using
sparse keymap") from the drivers-x86 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/platform/x86/Kconfig
index cff7cc2,8498389..0000000
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -486,12 -490,10 +490,12 @@@ config TOPSTAR_LAPTO
  config ACPI_TOSHIBA
  	tristate "Toshiba Laptop Extras"
  	depends on ACPI
 +	depends on LEDS_CLASS
 +	depends on NEW_LEDS
 +	depends on BACKLIGHT_CLASS_DEVICE
  	depends on INPUT
  	depends on RFKILL || RFKILL = n
- 	select INPUT_POLLDEV
+ 	select INPUT_SPARSEKMAP
 -	select BACKLIGHT_CLASS_DEVICE
  	---help---
  	  This driver adds support for access to certain system settings
  	  on "legacy free" Toshiba laptops.  These laptops can be recognized by