diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-07-30 21:16:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-07-30 21:16:20 +0200 |
commit | 22680de60d5daafcfda0dd289b5f89716315a97a (patch) | |
tree | 95a9843b8cc3e028da84a910162cfe6c7ed0d856 /kernel-i686-PAE.config | |
parent | 8d69cbeee74c978a0b3b86f4087675a3314b0e70 (diff) | |
parent | 0256b7c58a87eb78d9921e675abb285ffb09d48a (diff) | |
download | kernel-22680de60d5daafcfda0dd289b5f89716315a97a.tar.gz kernel-22680de60d5daafcfda0dd289b5f89716315a97a.tar.xz kernel-22680de60d5daafcfda0dd289b5f89716315a97a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc7.git0.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc7.git0.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc7.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-i686-PAE.config')
-rw-r--r-- | kernel-i686-PAE.config | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 7aa906ed6..996057b27 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -203,6 +203,8 @@ CONFIG_ALIM7101_WDT=m CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m +CONFIG_ALTERA_PR_IP_CORE=m +CONFIG_ALTERA_PR_IP_CORE_PLAT=m CONFIG_ALTERA_STAPL=m CONFIG_ALTERA_TSE=m CONFIG_ALX=m @@ -833,6 +835,7 @@ CONFIG_COMPAL_LAPTOP=m CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=3 CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y @@ -1632,7 +1635,16 @@ CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m CONFIG_FORTIFY_SOURCE=y -# CONFIG_FPGA is not set +CONFIG_FPGA_BRIDGE=m +CONFIG_FPGA=m +CONFIG_FPGA_MGR_ALTERA_CVP=m +CONFIG_FPGA_MGR_ALTERA_PS_SPI=m +CONFIG_FPGA_MGR_ICE40_SPI=m +CONFIG_FPGA_MGR_MACHXO2_SPI=m +CONFIG_FPGA_MGR_XILINX_SPI=m +CONFIG_FPGA_MGR_ZYNQ_FPGA=m +CONFIG_FPGA_REGION=m +CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -3961,6 +3973,7 @@ CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OF_FPGA_REGION=m # CONFIG_OF_OVERLAY is not set CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set @@ -6598,6 +6611,7 @@ CONFIG_XFS_QUOTA=y # CONFIG_XFS_WARN is not set # CONFIG_XILINX_DMA is not set CONFIG_XILINX_GMII2RGMII=m +CONFIG_XILINX_PR_DECOUPLER=m CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set CONFIG_XILLYBUS=m |