Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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*/