linux-next: manual merge of the wireless tree with the acpi tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/platform/x86/Kconfig between commit
eedd8dca3c0e6c1fcb5cba11321ea9d69917d85b ("eeepc-laptop: Register as a
pci-hotplug device") from the acpi tree and commit
c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the
wireless tree.

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

diff --cc drivers/platform/x86/Kconfig
index 58f1c7a,c682ac5..0000000
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -352,10 -337,9 +351,10 @@@ config EEEPC_LAPTO
  	depends on ACPI
  	depends on INPUT
  	depends on EXPERIMENTAL
+ 	depends on RFKILL || RFKILL = n
  	select BACKLIGHT_CLASS_DEVICE
  	select HWMON
- 	select RFKILL
 +	select HOTPLUG_PCI
  	---help---
  	  This driver supports the Fn-Fx keys on Eee PC laptops.
  	  It also adds the ability to switch camera/wlan on/off.
--
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/