From 005d233274490b980c3ba94c6de6e848399aaf94 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Apr 19 2016 13:39:30 +0000
Subject: Enable XILLYBUS (rhbz 1328394)


---

diff --git a/config-armv7 b/config-armv7
index a238c8d..bcf054c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -590,8 +590,6 @@ CONFIG_XILINX_VDMA=m
 CONFIG_SND_SOC_ADI=m
 CONFIG_SND_SOC_ADI_AXI_I2S=m
 CONFIG_SND_SOC_ADI_AXI_SPDIF=m
-CONFIG_XILLYBUS=m
-CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_GS_FPGABOOT=m
 CONFIG_USB_GADGET_XILINX=m
diff --git a/config-generic b/config-generic
index 24b9f8b..455f7f7 100644
--- a/config-generic
+++ b/config-generic
@@ -3372,6 +3372,9 @@ CONFIG_MWAVE=m
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+# CONFIG_XILLYBUS_OF is not set
 
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_MEDIA_PCI_SUPPORT=y
@@ -5639,7 +5642,6 @@ CONFIG_USBIP_HOST=m
 # CONFIG_VT6655 is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_LUSTRE_FS is not set
-# CONFIG_XILLYBUS is not set
 # CONFIG_DGAP is not set
 # CONFIG_DGNC is not set
 # CONFIG_RTS5208 is not set
diff --git a/kernel.spec b/kernel.spec
index 58d4a2d..727bbd8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2136,6 +2136,9 @@ fi
 #
 # 
 %changelog
+* Tue Apr 19 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable XILLYBUS (rhbz 1328394)
+
 * Mon Apr 18 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc4.git0.1
 - Linux v4.6-rc4
 - Disable debugging options.