diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-28 17:31:38 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-28 17:31:38 -0600 |
| commit | ef823d9ecf2e85c3915f307a9916d2e095923f5a (patch) | |
| tree | 4c07e93746dd3987c66d8c085dc8014268159833 /libre/linux-libre/config.x86_64 | |
| parent | 03121eb4568287e76a54d318073dd263ef298738 (diff) | |
| parent | beb8b1041efbb1bce8e7c2e0aa734d3170eee21e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/config.x86_64')
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 0a16459f0..24d6be2bd 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.3-1 Kernel Configuration +# Linux/x86 3.9.4-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4978,7 +4978,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=m # |