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-s390x-debug.config | |
parent | 0695f06e29170d1ad1c8369303526dedb4e1ac4b (diff) | |
parent | bf590656f4bcf3aabc56f78ed7de8dbc55988156 (diff) | |
download | kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc26.tar.gz kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc26.tar.xz kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc26.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-s390x-debug.config')
-rw-r--r-- | kernel-s390x-debug.config | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 26f8d7182..b49f3a9b7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -352,7 +352,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA is not set -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 @@ -383,7 +383,6 @@ CONFIG_BLK_DEV_BSG=y 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 @@ -608,7 +607,7 @@ CONFIG_CCW=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD is not set # 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 @@ -2704,7 +2703,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 is not set @@ -3141,7 +3139,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 is not set CONFIG_NFC_DIGITAL=m @@ -3777,7 +3774,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 @@ -5196,7 +5192,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 |