Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[cascardo/linux.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3be9c83..7e3e8a8 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -254,12 +254,12 @@ config MARCH_ZEC12
          older machines.
 
 config MARCH_Z13
-       bool "IBM z13"
+       bool "IBM z13s and z13"
        select HAVE_MARCH_Z13_FEATURES
        help
-         Select this to enable optimizations for IBM z13 (2964 series).
-         The kernel will be slightly faster but will not work on older
-         machines.
+         Select this to enable optimizations for IBM z13s and z13 (2965 and
+         2964 series). The kernel will be slightly faster but will not work on
+         older machines.
 
 endchoice
 
@@ -605,8 +605,6 @@ config PCI_NR_MSI
          PCI devices.
 
 source "drivers/pci/Kconfig"
-source "drivers/pci/pcie/Kconfig"
-source "drivers/pci/hotplug/Kconfig"
 
 endif  # PCI