Update for kernel 6.13: Switch to the new Intel CPU defines.

Kernel 6.13 changed the Intel CPU define names and removed the
X86_MATCH_VENDOR_FAM_MODEL; update tuxedo_keyboard.c to match.

Signed-off-by: 123485k <1758961307@qq.com>
This commit is contained in:
123485k 2025-02-19 21:43:13 +08:00
parent 9e32df5052
commit d51aba8518
No known key found for this signature in database
GPG key ID: 797E52891AF9B683
2 changed files with 10 additions and 5 deletions

View file

@ -16,11 +16,11 @@
# You should have received a copy of the GNU General Public License
# along with this software. If not, see <https://www.gnu.org/licenses/>.
#
obj-m := ./src/tuxedo_keyboard.o \
./src/clevo_wmi.o \
./src/clevo_acpi.o \
./src/tuxedo_io/tuxedo_io.o \
./src/uniwill_wmi.o
obj-m := src/tuxedo_keyboard.o \
src/clevo_wmi.o \
src/clevo_acpi.o \
src/tuxedo_io/tuxedo_io.o \
src/uniwill_wmi.o
PWD := $(shell pwd)
KDIR := /lib/modules/$(shell uname -r)/build

View file

@ -339,7 +339,12 @@ static const struct x86_cpu_id skip_tuxedo_dmi_string_check_match[] __initconst
X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, NULL),
X86_MATCH_VFM(INTEL_XEON_PHI_KNL, NULL),
X86_MATCH_VFM(INTEL_XEON_PHI_KNM, NULL),
// Compatibility defines: INTEL_FAM5_QUARK_X1000 remove in 6.13
#ifdef INTEL_FAM5_QUARK_X1000
X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),
#else
X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),
#endif
X86_MATCH_VENDOR_FAM(AMD, 5, NULL),
X86_MATCH_VENDOR_FAM(AMD, 6, NULL),
X86_MATCH_VENDOR_FAM(AMD, 15, NULL),