diff options
| author | Ingo Molnar <[email protected]> | 2021-10-16 15:17:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2021-10-16 15:17:46 +0200 |
| commit | 082f20b21de20285da2cbfc1be29656f0714c1b8 (patch) | |
| tree | 6170af99f1491fe256351b9cf92725dbda79c153 /drivers/platform/x86/intel/punit_ipc.c | |
| parent | 724fc0248d450224b19ef5b5ee41e392348f6704 (diff) | |
| parent | b2381acd3fd9bacd2c63f53b2c610c89959b31cc (diff) | |
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
Resolve the conflict between these commits:
x86/fpu: 1193f408cd51 ("x86/fpu/signal: Change return type of __fpu_restore_sig() to boolean")
x86/urgent: d298b03506d3 ("x86/fpu: Restore the masking out of reserved MXCSR bits")
b2381acd3fd9 ("x86/fpu: Mask out the invalid MXCSR bits properly")
Conflicts:
arch/x86/kernel/fpu/signal.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/platform/x86/intel/punit_ipc.c')
| -rw-r--r-- | drivers/platform/x86/intel/punit_ipc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel/punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c index f58b8543f6ac..66bb39fd0ef9 100644 --- a/drivers/platform/x86/intel/punit_ipc.c +++ b/drivers/platform/x86/intel/punit_ipc.c @@ -8,7 +8,6 @@ * which provide mailbox interface for power management usage. */ -#include <linux/acpi.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/device.h> @@ -319,7 +318,7 @@ static struct platform_driver intel_punit_ipc_driver = { .remove = intel_punit_ipc_remove, .driver = { .name = "intel_punit_ipc", - .acpi_match_table = ACPI_PTR(punit_ipc_acpi_ids), + .acpi_match_table = punit_ipc_acpi_ids, }, }; |