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.
Showing the changes to include/linux/platform_data (1 of 25 files). Show all
Unified · Split
| @@ -36,6 +36,7 @@ struct pmc_ipc_rbuf { · 35 unmodified lines | ||
| 36 | 36 | */ |
| 37 | 37 | static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf *rbuf) |
| 38 | 38 | { |
| 39 | +#ifdef CONFIG_ACPI | |
| 39 | 40 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
| 40 | 41 | union acpi_object params[PMC_IPCS_PARAM_COUNT] = { |
| 41 | 42 | {.type = ACPI_TYPE_INTEGER,}, |
| @@ -89,6 +90,9 @@ static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf · 47 unmodified lines | ||
| 89 | 90 | } |
| 90 | 91 | |
| 91 | 92 | return 0; |
| 93 | +#else | |
| 94 | + return -ENODEV; | |
| 95 | +#endif /* CONFIG_ACPI */ | |
| 92 | 96 | } |
| 93 | 97 | |
| 94 | 98 | #endif /* INTEL_PMC_IPC_H */ |