aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/ppc64e_defconfig
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-04-21 09:37:13 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-04-21 09:37:13 -0400
commit3bda03865fcaf5e30248bf4b7b37a81f6966caf9 (patch)
tree40e1edb696326bfbd028afc271e7272d87b6b506 /arch/powerpc/configs/ppc64e_defconfig
parentkvm: Disable objtool frame pointer checking for vmenter.S (diff)
parentMAINTAINERS: add a reviewer for KVM/s390 (diff)
downloadlinux-dev-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.tar.xz
linux-dev-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.zip
Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fix for 5.7 and maintainer update - Silence false positive lockdep warning - add Claudio as reviewer
Diffstat (limited to 'arch/powerpc/configs/ppc64e_defconfig')
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index 0d746774c2bd..33a01a9e86be 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -60,7 +60,6 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_FC_ATTRS=y