diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-13 10:28:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-13 10:28:43 +0200 |
commit | d6fd520355f1d3a9fd806285190654fb4aed84b6 (patch) | |
tree | 668602ceb0ea8de9f088198fcce2da0bcd9c45b0 /kernel-x86_64.config | |
parent | 0695f06e29170d1ad1c8369303526dedb4e1ac4b (diff) | |
parent | bf590656f4bcf3aabc56f78ed7de8dbc55988156 (diff) | |
download | kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc24.tar.gz kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc24.tar.xz kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-x86_64.config')
-rw-r--r-- | kernel-x86_64.config | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4a52f9f7d..2d35eaedb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -406,7 +406,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -442,7 +442,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -669,7 +668,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2990,7 +2989,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3439,7 +3437,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4124,7 +4121,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5591,7 +5587,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y |