Merge branch 'acpi-platform'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:52 +0000 (23:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:52 +0000 (23:11 +0200)
* acpi-platform:
  ACPI / platform / LPSS: Enable async suspend/resume of LPSS devices
  ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips

1  2 
drivers/acpi/acpi_platform.c

index 1d4950388fa13b9fc6050fbaf419ae68c796f24d,9f7bcfdf18ef8a2b79e7f29855df0fd89cffda6c..3bb89def22921483a60c50d0468f885a794174ed
@@@ -29,8 -29,13 +29,12 @@@ ACPI_MODULE_NAME("platform")
  static const struct acpi_device_id acpi_platform_device_ids[] = {
  
        { "PNP0D40" },
 -      { "ACPI0003" },
        { "VPC2004" },
        { "BCM4752" },
+       { "LNV4752" },
+       { "BCM2E1A" },
+       { "BCM2E39" },
+       { "BCM2E3D" },
  
        /* Intel Smart Sound Technology */
        { "INT33C8" },