From d71010a200aeb4262e8f97dd645d82f1931422d0 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Thu, 18 Oct 2012 08:39:41 -0400
Subject: [PATCH] Enable VFIO (rhbz 867152)

---
 config-generic | 4 +++-
 kernel.spec    | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config-generic b/config-generic
index c7a03cf20..8fca0dc4b 100644
--- a/config-generic
+++ b/config-generic
@@ -4159,7 +4159,9 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
 
-# CONFIG_VFIO is not set
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_PCI=m
 
 
 # LIRC
diff --git a/kernel.spec b/kernel.spec
index f54b2c339..1e9ada3ef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2311,6 +2311,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Oct 18 2012 Josh Boyer <jwboyer@redhat.com>
+- Enable VFIO (rhbz 867152)
+
 * Wed Oct 17 2012 Justin M. Forbes <jforbes@redhat.com> - 3.7.0-0.rc1.git1.1
 - Linux v3.7-rc1-78-g8d2b6b3