diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-06 00:33:52 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-06 00:33:52 +0100 |
| commit | 929823040ab8609e88ae4acf32914dde0d063896 (patch) | |
| tree | 8fa93f3f4faf4affe9902c2c0979f1c5799a7730 | |
| parent | ed1f0eeebaeeb7f790e9e7642116a208581e5bfc (diff) | |
| parent | 2db8f9a1d86aa32a9cbf1a975882b4fa162f040f (diff) | |
| download | linux-929823040ab8609e88ae4acf32914dde0d063896.tar.bz2 | |
Merge branches 'pnp' and 'acpi-cppc'
* pnp:
PNP: Add Haswell-ULT to Intel MCH size workaround
* acpi-cppc:
ACPI / CPPC: remove redundant mbox_send_message() declaration
| -rw-r--r-- | include/acpi/cppc_acpi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h index 717a29810473..dad8af3ebeb5 100644 --- a/include/acpi/cppc_acpi.h +++ b/include/acpi/cppc_acpi.h @@ -133,6 +133,5 @@ extern int acpi_get_psd_map(struct cpudata **); /* Methods to interact with the PCC mailbox controller. */ extern struct mbox_chan * pcc_mbox_request_channel(struct mbox_client *, unsigned int); -extern int mbox_send_message(struct mbox_chan *chan, void *mssg); #endif /* _CPPC_ACPI_H*/ |