diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-05-12 00:18:11 +0300 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-05-12 00:18:11 +0300 |
| commit | 593ee93aa710ea0159f363b2f1950ecb6c9ddca2 (patch) | |
| tree | 806cc74dd9a3f0481f320455b0a59e21300f7958 /include | |
| parent | f94ffc3f0b90bf4880e0abf2c056fc465e2c3be8 (diff) | |
| parent | bfcfe6d335a967f8ea0c1980960e6f0205b5de6e (diff) | |
| download | linux-593ee93aa710ea0159f363b2f1950ecb6c9ddca2.tar.xz | |
Merge branch 'fixes' into for-next
Resolve conflicts in dell/alienware-wmi-wmax and asus-wmi, and enable
applying a few amd/hsmp patches that depend on changes in the fixes
branch.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/x86/intel_pmc_ipc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/x86/intel_pmc_ipc.h b/include/linux/platform_data/x86/intel_pmc_ipc.h index 6e603a8c075f..1d34435b7001 100644 --- a/include/linux/platform_data/x86/intel_pmc_ipc.h +++ b/include/linux/platform_data/x86/intel_pmc_ipc.h @@ -36,6 +36,7 @@ struct pmc_ipc_rbuf { */ static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf *rbuf) { +#ifdef CONFIG_ACPI struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; union acpi_object params[PMC_IPCS_PARAM_COUNT] = { {.type = ACPI_TYPE_INTEGER,}, @@ -89,6 +90,9 @@ static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf } return 0; +#else + return -ENODEV; +#endif /* CONFIG_ACPI */ } #endif /* INTEL_PMC_IPC_H */ |