diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-04-19 09:39:30 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-04-19 09:39:30 -0400 |
| commit | 005d233274490b980c3ba94c6de6e848399aaf94 (patch) | |
| tree | a0c14006b0951f615b49130bd4db67170a341f6d | |
| parent | e4c8b258966abca93708241e98f31070a553a12f (diff) | |
| download | kernel-005d233274490b980c3ba94c6de6e848399aaf94.tar.gz kernel-005d233274490b980c3ba94c6de6e848399aaf94.tar.xz kernel-005d233274490b980c3ba94c6de6e848399aaf94.zip | |
Enable XILLYBUS (rhbz 1328394)
| -rw-r--r-- | config-armv7 | 2 | ||||
| -rw-r--r-- | config-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7 index a238c8d1d..bcf054c3e 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 24b9f8bb4..455f7f728 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 58d4a2d34..727bbd892 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. |