summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/ppc6xx_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-08-22 10:04:15 +0200
committerIngo Molnar <mingo@kernel.org>2014-08-22 10:04:15 +0200
commit80b304fd00e8b667775ff791121b61ecd7cd0c03 (patch)
treeb4f2ec59fe062c43343ee4c2f10a6bcd0e4dcd1b /arch/powerpc/configs/ppc6xx_defconfig
parentx86_32, entry: Clean up sysenter_badsys declaration (diff)
parentefi/arm64: Store Runtime Services revision (diff)
downloadlinux-80b304fd00e8b667775ff791121b61ecd7cd0c03.tar.xz
linux-80b304fd00e8b667775ff791121b61ecd7cd0c03.zip
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming: * WARN_ON(!spin_is_locked()) always triggers on non-SMP machines. Swap it for the more canonical lockdep_assert_held() which always does the right thing - Guenter Roeck * Assign the correct value to efi.runtime_version on arm64 so that all the runtime services can be invoked - Semen Protsenko Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/configs/ppc6xx_defconfig')
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index c91066944842..fec5870f1818 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -425,10 +425,8 @@ CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
CONFIG_SCSI_MESH=m
CONFIG_SCSI_MAC53C94=m
-CONFIG_SCSI_SRP=m
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_SCSI_DH=y
CONFIG_SCSI_DH_RDAC=m