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-aarch64-debug.config | |
| parent | 0695f06e29170d1ad1c8369303526dedb4e1ac4b (diff) | |
| parent | bf590656f4bcf3aabc56f78ed7de8dbc55988156 (diff) | |
| download | kernel-d6fd520355f1d3a9fd806285190654fb4aed84b6.tar.gz kernel-d6fd520355f1d3a9fd806285190654fb4aed84b6.tar.xz kernel-d6fd520355f1d3a9fd806285190654fb4aed84b6.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-aarch64-debug.config')
| -rw-r--r-- | kernel-aarch64-debug.config | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4ef10cb6a..2dcba8ef7 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -488,7 +488,7 @@ CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y -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_PDC_MBOX is not set @@ -521,7 +521,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 @@ -755,7 +754,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=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 @@ -4137,7 +4136,6 @@ CONFIG_QCOM_L3_PMU=y # CONFIG_QCOM_Q6V5_PIL is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_QFPROM=m -CONFIG_QCOM_SMD=m CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m |