diff options
| author | Ilpo Järvinen <[email protected]> | 2025-05-11 21:18:11 +0000 |
|---|---|---|
| committer | Ilpo Järvinen <[email protected]> | 2025-05-11 21:18:11 +0000 |
| commit | 593ee93aa710ea0159f363b2f1950ecb6c9ddca2 (patch) | |
| tree | 806cc74dd9a3f0481f320455b0a59e21300f7958 /drivers/platform/x86/amd/hsmp/acpi.c | |
| parent | platform/mellanox: mlxreg-dpu: Fix smatch warnings (diff) | |
| parent | platform/x86: asus-wmi: Fix wlan_ctrl_by_user detection (diff) | |
| download | kernel-593ee93aa710ea0159f363b2f1950ecb6c9ddca2.tar.gz kernel-593ee93aa710ea0159f363b2f1950ecb6c9ddca2.zip | |
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 'drivers/platform/x86/amd/hsmp/acpi.c')
| -rw-r--r-- | drivers/platform/x86/amd/hsmp/acpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c index c1eccb3c80c5..eaae044e4f82 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -27,9 +27,8 @@ #include "hsmp.h" -#define DRIVER_NAME "amd_hsmp" +#define DRIVER_NAME "hsmp_acpi" #define DRIVER_VERSION "2.3" -#define ACPI_HSMP_DEVICE_HID "AMDI0097" /* These are the strings specified in ACPI table */ #define MSG_IDOFF_STR "MsgIdOffset" |