From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 21:11:52 +0000 (+0200)
Subject: Merge branch 'acpi-platform'
X-Git-Tag: next-20140610~50^2~5^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2770b8b1fdf03c4dad6fc8f7e38101a9c4082f7b;p=karo-tx-linux.git

Merge branch 'acpi-platform'

* acpi-platform:
  ACPI / platform / LPSS: Enable async suspend/resume of LPSS devices
  ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips
---

2770b8b1fdf03c4dad6fc8f7e38101a9c4082f7b
diff --cc drivers/acpi/acpi_platform.c
index 1d4950388fa1,9f7bcfdf18ef..3bb89def2292
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@@ -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" },