diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-05 09:38:54 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-05 09:38:54 +0200 |
commit | 458f1a86f602410b6724ebf3cdadcddbce710f4c (patch) | |
tree | 13b386b5017cf5234273ef47bb8d747613733ffa /kernel-i686.config | |
parent | d9398fbac9d5a5a40aecdcc263348071b467486b (diff) | |
parent | ab80721865abf3dc3bf232fb212461a5ee24296a (diff) | |
download | kernel-4.18.0-0.rc0.git1.1.vanilla.knurd.1.fc29.tar.gz kernel-4.18.0-0.rc0.git1.1.vanilla.knurd.1.fc29.tar.xz kernel-4.18.0-0.rc0.git1.1.vanilla.knurd.1.fc29.zip |
merge masterkernel-4.18.0-0.rc0.git1.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 5473e7715..f835ca5e9 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -771,6 +771,7 @@ CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_ST=m CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m +# CONFIG_CHROMEOS_TBMC is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHT_DC_TI_PMIC_OPREGION=y CONFIG_CICADA_PHY=m @@ -1121,6 +1122,7 @@ CONFIG_DLM_DEBUG=y CONFIG_DLM=m CONFIG_DM9102=m # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_API_DEBUG_SG is not set # CONFIG_DMA_CMA is not set # CONFIG_DMADEVICES_DEBUG is not set CONFIG_DMADEVICES=y @@ -5407,6 +5409,7 @@ CONFIG_SPI_FSL_LPSPI=m # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y +# CONFIG_SPI_MEM is not set # CONFIG_SPI_OC_TINY is not set CONFIG_SPI_PXA2XX=m # CONFIG_SPI_ROCKCHIP is not set |