From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Jan 2014 22:45:52 +0000 (+0100)
Subject: Merge branch 'acpi-dsm'
X-Git-Tag: android-x86-4.4-r2~1821^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fbb9c10d40f88011ac72f855c97e3bdd981026a9;p=android-x86%2Fkernel.git

Merge branch 'acpi-dsm'

* acpi-dsm:
  ACPI / extlog: replace open-coded _DSM code with helper functions
  ACPI / nouveau: replace open-coded _DSM code with helper functions
  nouveau / ACPI: fix memory leak in ACPI _DSM related code
  ACPI / i915: replace open-coded _DSM code with helper functions
  ACPI / i2c-hid: replace open-coded _DSM code with helper functions
  ACPI / TPM: detect PPI features by checking availability of _DSM functions
  ACPI / TPM: replace open-coded _DSM code with helper functions
  ACPI / TPM: match node name instead of full path when searching for TPM device
  PCI / pci-label: treat PCI label with index 0 as valid label
  ACPI / PCI: replace open-coded _DSM code with helper functions
  PCI / pci-label: release allocated ACPI object on error recovery path
  ACPI: introduce helper interfaces for _DSM method
---

fbb9c10d40f88011ac72f855c97e3bdd981026a9
diff --cc drivers/char/tpm/tpm_ppi.c
index 70dbee4b50e9,117fab6daf39..b3ea223585bd
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@@ -1,15 -1,7 +1,6 @@@
  #include <linux/acpi.h>
 -#include <acpi/acpi_drivers.h>
  #include "tpm.h"
  
- static const u8 tpm_ppi_uuid[] = {
- 	0xA6, 0xFA, 0xDD, 0x3D,
- 	0x1B, 0x36,
- 	0xB4, 0x4E,
- 	0xA4, 0x24,
- 	0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53
- };
- static char *tpm_device_name = "TPM";
- 
  #define TPM_PPI_REVISION_ID	1
  #define TPM_PPI_FN_VERSION	1
  #define TPM_PPI_FN_SUBREQ	2