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
This commit is contained in:
commit
929823040a
1 changed files with 0 additions and 1 deletions
|
@ -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*/
|
||||||
|
|
Loading…
Reference in a new issue