PCI: consolidate PCI config entry in drivers/pci

[mirror_ubuntu-eoan-kernel.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8be31261aec83190a65927854d214d613244c164..8eba699e8ea34e113e6dcaacc415a9374d57cb76 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -168,6 +168,7 @@ config PPC
        select GENERIC_CPU_VULNERABILITIES      if PPC_BARRIER_NOSPEC
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
+       select GENERIC_PCI_IOMAP                if PCI
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
@@ -930,23 +931,6 @@ config FSL_GTM
        help
          Freescale General-purpose Timers support
 
-# Platforms that what PCI turned unconditionally just do select PCI
-# in their config node.  Platforms that want to choose at config
-# time should select PPC_PCI_CHOICE
-config PPC_PCI_CHOICE
-       bool
-
-config PCI
-       bool "PCI support" if PPC_PCI_CHOICE
-       default y if !40x && !CPM2 && !PPC_8xx && !PPC_83xx \
-               && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
-       select GENERIC_PCI_IOMAP
-       help
-         Find out whether your system includes a PCI bus. PCI is the name of
-         a bus system, i.e. the way the CPU talks to the other stuff inside
-         your box.  If you say Y here, the kernel will include drivers and
-         infrastructure code to support PCI bus devices.
-
 config PCI_DOMAINS
        def_bool PCI
 
@@ -959,8 +943,6 @@ config PCI_8260
        select PPC_INDIRECT_PCI
        default y
 
-source "drivers/pci/Kconfig"
-
 source "drivers/pcmcia/Kconfig"
 
 config HAS_RAPIDIO