Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

[linux-2.6-block.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6e9c66b3f054b011f9fff9991e94303ea6bbff86..ed554b09eb3f176eac1653f145cb3717df6aba08 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -166,14 +166,21 @@ config S390
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_NOP_MCOUNT
        select HAVE_OPROFILE
+       select HAVE_PCI
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_RSEQ
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_VIRT_CPU_ACCOUNTING
+       select IOMMU_HELPER             if PCI
+       select IOMMU_SUPPORT            if PCI
        select MODULES_USE_ELF_RELA
+       select NEED_DMA_MAP_STATE       if PCI
+       select NEED_SG_DMA_LENGTH       if PCI
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
+       select PCI_DOMAINS              if PCI
+       select PCI_MSI                  if PCI
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK
@@ -704,17 +711,6 @@ config QDIO
 
          If unsure, say Y.
 
-menuconfig PCI
-       bool "PCI support"
-       select PCI_MSI
-       select IOMMU_HELPER
-       select IOMMU_SUPPORT
-       select NEED_DMA_MAP_STATE
-       select NEED_SG_DMA_LENGTH
-
-       help
-         Enable PCI support.
-
 if PCI
 
 config PCI_NR_FUNCTIONS
@@ -725,13 +721,8 @@ config PCI_NR_FUNCTIONS
          This allows you to specify the maximum number of PCI functions which
          this kernel will support.
 
-source "drivers/pci/Kconfig"
-
 endif  # PCI
 
-config PCI_DOMAINS
-       def_bool PCI
-
 config HAS_IOMEM
        def_bool PCI
 
@@ -835,9 +826,6 @@ source "kernel/power/Kconfig"
 
 endmenu
 
-config PCMCIA
-       def_bool n
-
 config CCW
        def_bool y