diff options
| author | Ilpo Järvinen <[email protected]> | 2025-01-20 12:22:06 +0000 |
|---|---|---|
| committer | Ilpo Järvinen <[email protected]> | 2025-01-21 12:00:38 +0000 |
| commit | 0da9a3f9ac8ada83fa79579455871ec59f11db72 (patch) | |
| tree | 48a22c56221b8c9b3639cf132330117baf2c5181 /drivers/platform/x86/hp/hp-wmi.c | |
| parent | platform/x86: acer-wmi: Fix initialization of last_non_turbo_profile (diff) | |
| parent | platform/x86: lenovo-yoga-tab2-pro-1380-fastcharger: fix serdev race (diff) | |
| download | kernel-0da9a3f9ac8ada83fa79579455871ec59f11db72.tar.gz kernel-0da9a3f9ac8ada83fa79579455871ec59f11db72.zip | |
Merge branch 'fixes' into 'for-next'
Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
Diffstat (limited to 'drivers/platform/x86/hp/hp-wmi.c')
| -rw-r--r-- | drivers/platform/x86/hp/hp-wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c index ee3a915dd6ce..db5fdee2109c 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -68,7 +68,7 @@ static const char * const omen_thermal_profile_boards[] = { "874A", "8603", "8604", "8748", "886B", "886C", "878A", "878B", "878C", "88C8", "88CB", "8786", "8787", "8788", "88D1", "88D2", "88F4", "88FD", "88F5", "88F6", "88F7", "88FE", "88FF", "8900", "8901", "8902", "8912", - "8917", "8918", "8949", "894A", "89EB", "8BAD", "8A42" + "8917", "8918", "8949", "894A", "89EB", "8BAD", "8A42", "8A15" }; /* DMI Board names of Omen laptops that are specifically set to be thermal @@ -84,7 +84,7 @@ static const char * const omen_thermal_profile_force_v0_boards[] = { * "balanced" when reaching zero. */ static const char * const omen_timed_thermal_profile_boards[] = { - "8BAD", "8A42" + "8BAD", "8A42", "8A15" }; /* DMI Board names of Victus 16-d1xxx laptops */ |