diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:04:13 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:04:13 +0100 |
| commit | 764007895bd490c1f0d031b9cccea5c2b30c9e1e (patch) | |
| tree | 43e3821d53f4b2b341b53ade1657ab3b2af76eb6 /core/linux/config.i686 | |
| parent | 35c2cef0a5115fd45325bdbc847c59cdf3a0c401 (diff) | |
| parent | c29a2d11cbb1467d5c54d272557f6299ea2967eb (diff) | |
| download | packages-764007895bd490c1f0d031b9cccea5c2b30c9e1e.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core/linux/config.i686')
| -rw-r--r-- | core/linux/config.i686 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/linux/config.i686 b/core/linux/config.i686 index 90c8e3f1..f800acc8 100644 --- a/core/linux/config.i686 +++ b/core/linux/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.12-arch1 Kernel Configuration +# Linux/x86 4.18.16-arch1 Kernel Configuration # # @@ -1335,8 +1335,8 @@ CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m CONFIG_NF_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NFT_MASQ_IPV4=m CONFIG_NFT_REDIR_IPV4=m CONFIG_NF_NAT_SNMP_BASIC=m @@ -7521,18 +7521,18 @@ CONFIG_UIO_NETX=m CONFIG_UIO_PRUSS=m CONFIG_UIO_MF624=m CONFIG_UIO_HV_GENERIC=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO_VIRQFD=m -CONFIG_VFIO=m +CONFIG_VFIO_IOMMU_TYPE1=y +CONFIG_VFIO_VIRQFD=y +CONFIG_VFIO=y # CONFIG_VFIO_NOIOMMU is not set -CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI=y CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI_IGD=y -CONFIG_VFIO_MDEV=m -CONFIG_VFIO_MDEV_DEVICE=m -CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_VFIO_MDEV=y +CONFIG_VFIO_MDEV_DEVICE=y +CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRT_DRIVERS=y CONFIG_VBOXGUEST=m CONFIG_VIRTIO=m |