Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (45 commits)
  acer-wmi: replaced the hard coded bitmap by the communication devices bitmap from SMBIOS
  acer-wmi: check the existence of internal wireless device when set capability
  acer-wmi: add ACER_WMID_v2 interface flag to represent new notebooks
  sony-laptop:irq: Remove IRQF_DISABLED
  asus-laptop: Add rfkill support for Pegatron Lucid tablet
  asus-laptop: pega_accel - Report accelerometer orientation change through udev
  asus-laptop: fix module description
  asus-laptop: hide leds on Pegatron Lucid
  asus-laptop: Pegatron Lucid accelerometer
  asus-laptop: allow boot time control of Pegatron ALS sensor
  Platform: samsung_laptop: add support for X520 machines.
  platform: samsung_laptop: add dmi information for Samsung R700 laptops
  hp_accel: Add axis-mapping for HP ProBook / EliteBook
  hp_accel: Add a new PNP id
  WMI: properly cleanup devices to avoid crashes
  ideapad: remove sysfs node for cfg
  ideapad: add debugfs support
  ideapad: add event for Novo key
  ideapad: change parameter of ideapad_sync_rfk_state
  ideapad: define vpc commands
  ...

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 10cf2500522b..f4e3d82379d7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -61,15 +61,18 @@ config ASUS_LAPTOP
         depends on INPUT
         depends on RFKILL || RFKILL = n
         select INPUT_SPARSEKMAP
+        select INPUT_POLLDEV
         ---help---
-          This is the new Linux driver for Asus laptops. It may also support some
-          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
-          standard ACPI events and input events. It also adds
-          support for video output switching, LCD backlight control, Bluetooth and
-          Wlan control, and most importantly, allows you to blink those fancy LEDs.
+          This is a driver for Asus laptops, Lenovo SL and the Pegatron
+          Lucid tablet. It may also support some MEDION, JVC or VICTOR
+          laptops. It makes all the extra buttons generate standard
+          ACPI events and input events, and on the Lucid the built-in
+          accelerometer appears as an input device.  It also adds
+          support for video output switching, LCD backlight control,
+          Bluetooth and Wlan control, and most importantly, allows you
+          to blink those fancy LEDs.
 
-          For more information and a userspace daemon for handling the extra
-          buttons see <http://acpi4asus.sf.net>.
+          For more information see <http://acpi4asus.sf.net>.
 
           If you have an ACPI-compatible ASUS laptop, say Y or M here.