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/thinkpad_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/thinkpad_acpi.c')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index bdd33671a79f..a57edac58982 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -11519,6 +11519,8 @@ static int __must_check __init get_thinkpad_model_data( tp->vendor = PCI_VENDOR_ID_IBM; else if (dmi_name_in_vendors("LENOVO")) tp->vendor = PCI_VENDOR_ID_LENOVO; + else if (dmi_name_in_vendors("NEC")) + tp->vendor = PCI_VENDOR_ID_LENOVO; else return 0; |