diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-15 07:34:00 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-15 07:34:00 +0100 |
commit | 85ec4b97e6299c2a10f6910576b683cdbc9f8386 (patch) | |
tree | c5375c193607a9562fa566a4f73250ec0cb6cac9 /kernel-armv7hl.config | |
parent | e13cc7ad832a032d2e96b438639954916dd316cc (diff) | |
parent | 2ef4e8028f509354fb5a339bd2f8d0d1df8f2e8d (diff) | |
download | kernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc27.tar.gz kernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc27.tar.xz kernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc27.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc0.git2.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r-- | kernel-armv7hl.config | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 2e29e4e35..03c3da82a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -630,6 +630,7 @@ CONFIG_BONDING=m # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +# CONFIG_BOOTPARAM_LOCKDEP_CROSSRELEASE_FULLSTACK is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y CONFIG_BOUNCE=y @@ -975,6 +976,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE=y +# CONFIG_CPU_ISOLATION is not set CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y CONFIG_CPU_SW_DOMAIN_PAN=y @@ -1448,6 +1450,7 @@ CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set +# CONFIG_DS4424 is not set # CONFIG_DT3155 is not set CONFIG_DTC=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 @@ -2237,6 +2240,7 @@ CONFIG_IIO_BUFFER_CB=m CONFIG_IIO_BUFFER=y CONFIG_IIO_CONFIGFS=m CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m CONFIG_IIO_CROS_EC_BARO=m CONFIG_IIO_CROS_EC_LIGHT_PROX=m CONFIG_IIO_CROS_EC_SENSORS_CORE=m @@ -3133,6 +3137,7 @@ CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set CONFIG_MESON_GX_SOCINFO=y +CONFIG_MESON_IRQ_GPIO=y CONFIG_MESON_SARADC=m CONFIG_MESON_SM=y CONFIG_MESON_WATCHDOG=m @@ -3314,6 +3319,7 @@ CONFIG_MMC_DW_PCI=m CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_DW_ROCKCHIP=m # CONFIG_MMC_MESON_GX is not set +CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m CONFIG_MMC_MXC=m @@ -3334,6 +3340,7 @@ CONFIG_MMC_SDHCI_MSM=m CONFIG_MMC_SDHCI_OF_ARASAN=m # CONFIG_MMC_SDHCI_OF_AT91 is not set CONFIG_MMC_SDHCI_OF_ESDHC=m +CONFIG_MMC_SDHCI_OMAP=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PXAV2=m @@ -4732,6 +4739,7 @@ CONFIG_RESET_GPIO=y # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SCI is not set # CONFIG_RESET_TI_SYSCON is not set +# CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y @@ -6139,6 +6147,7 @@ CONFIG_TI_CPSW=m CONFIG_TI_CPSW_PHY_SEL=y CONFIG_TI_CPTS_MOD=m CONFIG_TI_CPTS=y +# CONFIG_TI_DAC082S085 is not set CONFIG_TI_DAC7512=m CONFIG_TI_DAVINCI_CPDMA=m CONFIG_TI_DAVINCI_EMAC=m @@ -6250,6 +6259,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m # CONFIG_TPS6105X is not set # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set +# CONFIG_TPS68470_PMIC_OPREGION is not set # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_TRACE_ENUM_MAP_FILE is not set CONFIG_TRACE_EVAL_MAP_FILE=y @@ -6286,6 +6296,7 @@ CONFIG_TWL6040_CORE=y CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_TPS6598X=m CONFIG_TYPEC_UCSI=m CONFIG_TYPEC_WCOVE=m CONFIG_TYPHOON=m |