diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-26 20:14:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-26 20:14:55 +0200 |
| commit | 92ef74803ebd37d9d461c4391e6cf6f8a7ef7c0e (patch) | |
| tree | 25e67afe0f71479419fd5d5422b26bd70ad4d701 /kernel-i686.config | |
| parent | 0495610cc4c3d52f175a15728924114d6e545925 (diff) | |
| parent | 56b7c1633b0c23b09f9e2b4ecfe884d82e5abe66 (diff) | |
| download | kernel-92ef74803ebd37d9d461c4391e6cf6f8a7ef7c0e.tar.gz kernel-92ef74803ebd37d9d461c4391e6cf6f8a7ef7c0e.tar.xz kernel-92ef74803ebd37d9d461c4391e6cf6f8a7ef7c0e.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'kernel-i686.config')
| -rw-r--r-- | kernel-i686.config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index c34acb98f..c5809f722 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1354,7 +1354,6 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_ADC_JACK is not set -CONFIG_EXTCON_INTEL_CHT_WC=y CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON is not set # CONFIG_EXTCON_QCOM_SPMI_MISC is not set @@ -2102,6 +2101,7 @@ CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y @@ -2125,6 +2125,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SCU_IPC is not set CONFIG_INTEL_SMARTCONNECT=y CONFIG_INTEL_SOC_DTS_THERMAL=m +# CONFIG_INTEL_SOC_PMIC_CHTWC is not set CONFIG_INTEL_SOC_PMIC=y # CONFIG_INTEL_TH is not set # CONFIG_INTEL_TXT is not set @@ -4588,7 +4589,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_MOXA=m CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_PCI=m +CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_RUNTIME_UARTS=32 |