diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-20 05:49:04 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-20 05:49:04 +0200 |
commit | dfb64634d5b4a6b91493c3f5a0ba665a9104bae0 (patch) | |
tree | 6a3056a749690b0feb321901b382fb90ee09f14c /kernel-ppc64le.config | |
parent | b737f8fbced0744768781c824f00fd24b04493b3 (diff) | |
parent | 2a0ad70ea25219cd7c3779ef9f485c5df2ba3a9e (diff) | |
download | kernel-dfb64634d5b4a6b91493c3f5a0ba665a9104bae0.tar.gz kernel-dfb64634d5b4a6b91493c3f5a0ba665a9104bae0.tar.xz kernel-dfb64634d5b4a6b91493c3f5a0ba665a9104bae0.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc1.git1.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc1.git1.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-ppc64le.config')
-rw-r--r-- | kernel-ppc64le.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 5cfc41a10..ebd643140 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5663,7 +5663,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_BLK_SCSI=y +# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set |