Skip to content
Snippets Groups Projects
Commit 92982304 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents ed1f0eee 2db8f9a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/acpi/cppc_acpi.h
+ 0
− 1
View file @ 92982304
...@@ -133,6 +133,5 @@ extern int acpi_get_psd_map(struct cpudata **); ...@@ -133,6 +133,5 @@ extern int acpi_get_psd_map(struct cpudata **);
/* Methods to interact with the PCC mailbox controller. */ /* Methods to interact with the PCC mailbox controller. */
extern struct mbox_chan * extern struct mbox_chan *
pcc_mbox_request_channel(struct mbox_client *, unsigned int); pcc_mbox_request_channel(struct mbox_client *, unsigned int);
extern int mbox_send_message(struct mbox_chan *chan, void *mssg);
#endif /* _CPPC_ACPI_H*/ #endif /* _CPPC_ACPI_H*/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment