From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 30 May 2014 13:55:19 +0000 (+0200)
Subject: Merge branch 'acpi-lpss' into acpi-enumeration
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~5^2~7^2~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6

Merge branch 'acpi-lpss' into acpi-enumeration
---

52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6
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" },