Merge pull request #2999 from shiznix/master

Kernel support for recent Dell notebook Alps trackpads
This commit is contained in:
MilhouseVH 2018-10-25 14:40:32 +01:00 committed by GitHub
commit 868a61b7c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2875,8 +2875,9 @@ CONFIG_LPC_SCH=y
# CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
# CONFIG_MFD_INTEL_LPSS_ACPI is not set CONFIG_MFD_INTEL_LPSS=y
# CONFIG_MFD_INTEL_LPSS_PCI is not set CONFIG_MFD_INTEL_LPSS_ACPI=y
CONFIG_MFD_INTEL_LPSS_PCI=y
# CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set # CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM800 is not set
@ -3858,6 +3859,13 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
# CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH is not set
# #
# STMicroelectronics STM32 SOC audio support # STMicroelectronics STM32 SOC audio support
@ -4084,7 +4092,7 @@ CONFIG_HID_XINMO=y
# CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZEROPLUS is not set
CONFIG_HID_ZYDACRON=y CONFIG_HID_ZYDACRON=y
# CONFIG_HID_SENSOR_HUB is not set # CONFIG_HID_SENSOR_HUB is not set
# CONFIG_HID_ALPS is not set CONFIG_HID_ALPS=m
# #
# USB HID support # USB HID support
@ -4096,7 +4104,7 @@ CONFIG_USB_HIDDEV=y
# #
# I2C HID support # I2C HID support
# #
# CONFIG_I2C_HID is not set CONFIG_I2C_HID=m
# #
# Intel ISH HID support # Intel ISH HID support