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

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3a7cce7f80df7b77e4f8a7cb2204cf025e348c9d..a3f436ba554d68b8becca9c86105914be4c98078 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -104,6 +104,7 @@ config ARM
        select OF_RESERVED_MEM if OF
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
+       select PCI_SYSCALL if PCI
        select PERF_USE_VMALLOC
        select REFCOUNT_FULL
        select RTC_LIB
@@ -147,9 +148,6 @@ config ARM_DMA_IOMMU_ALIGNMENT
 
 endif
 
-config MIGHT_HAVE_PCI
-       bool
-
 config SYS_SUPPORTS_APM_EMULATION
        bool
 
@@ -163,21 +161,6 @@ config HAVE_PROC_CPU
 config NO_IOPORT_MAP
        bool
 
-config EISA
-       bool
-       ---help---
-         The Extended Industry Standard Architecture (EISA) bus was
-         developed as an open alternative to the IBM MicroChannel bus.
-
-         The EISA bus provided some of the features of the IBM MicroChannel
-         bus while maintaining backward compatibility with cards made for
-         the older ISA bus.  The EISA bus saw limited use between 1988 and
-         1995 when it was made obsolete by the PCI bus.
-
-         Say Y here if you are building a kernel for an EISA-based machine.
-
-         Otherwise, say N.
-
 config SBUS
        bool
 
@@ -333,8 +316,8 @@ config ARCH_MULTIPLATFORM
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_MULTI_HANDLER
-       select MIGHT_HAVE_PCI
-       select PCI_DOMAINS if PCI
+       select HAVE_PCI
+       select PCI_DOMAINS_GENERIC if PCI
        select SPARSE_IRQ
        select USE_OF
 
@@ -407,7 +390,7 @@ config ARCH_IOP13XX
        select CPU_XSC3
        select NEED_MACH_MEMORY_H
        select NEED_RET_TO_USER
-       select PCI
+       select FORCE_PCI
        select PLAT_IOP
        select VMSPLIT_1G
        select SPARSE_IRQ
@@ -421,7 +404,7 @@ config ARCH_IOP32X
        select GPIO_IOP
        select GPIOLIB
        select NEED_RET_TO_USER
-       select PCI
+       select FORCE_PCI
        select PLAT_IOP
        help
          Support for Intel's 80219 and IOP32X (XScale) family of
@@ -434,7 +417,7 @@ config ARCH_IOP33X
        select GPIO_IOP
        select GPIOLIB
        select NEED_RET_TO_USER
-       select PCI
+       select FORCE_PCI
        select PLAT_IOP
        help
          Support for Intel's IOP33X (XScale) family of processors.
@@ -449,7 +432,7 @@ config ARCH_IXP4XX
        select DMABOUNCE if PCI
        select GENERIC_CLOCKEVENTS
        select GPIOLIB
-       select MIGHT_HAVE_PCI
+       select HAVE_PCI
        select NEED_MACH_IO_H
        select USB_EHCI_BIG_ENDIAN_DESC
        select USB_EHCI_BIG_ENDIAN_MMIO
@@ -462,7 +445,7 @@ config ARCH_DOVE
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_MULTI_HANDLER
        select GPIOLIB
-       select MIGHT_HAVE_PCI
+       select HAVE_PCI
        select MVEBU_MBUS
        select PINCTRL
        select PINCTRL_DOVE
@@ -1230,46 +1213,18 @@ config ISA_DMA
 config ISA_DMA_API
        bool
 
-config PCI
-       bool "PCI support" if MIGHT_HAVE_PCI
-       help
-         Find out whether you have a PCI motherboard. PCI is the name of a
-         bus system, i.e. the way the CPU talks to the other stuff inside
-         your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
-         VESA. If you have PCI, say Y, otherwise N.
-
-config PCI_DOMAINS
-       bool "Support for multiple PCI domains"
-       depends on PCI
-       help
-         Enable PCI domains kernel management. Say Y if your machine
-         has a PCI bus hierarchy that requires more than one PCI
-         domain (aka segment) to be correctly managed. Say N otherwise.
-
-         If you don't know what to do here, say N.
-
-config PCI_DOMAINS_GENERIC
-       def_bool PCI_DOMAINS
-
 config PCI_NANOENGINE
        bool "BSE nanoEngine PCI support"
        depends on SA1100_NANOENGINE
        help
          Enable PCI on the BSE nanoEngine board.
 
-config PCI_SYSCALL
-       def_bool PCI
-
 config PCI_HOST_ITE8152
        bool
        depends on PCI && MACH_ARMCORE
        default y
        select DMABOUNCE
 
-source "drivers/pci/Kconfig"
-
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "Kernel Features"