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

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

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index ca8e26d045a9910f4f493c983d70788aa52ba1f7..376366a7db81c8c979628d22c37a1028fcc12fed 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -45,14 +45,12 @@ config ARC
        select OF
        select OF_EARLY_FLATTREE
        select OF_RESERVED_MEM
+       select PCI_SYSCALL if PCI
        select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING
 
 config ARCH_HAS_CACHE_LINE_SIZE
        def_bool y
 
-config MIGHT_HAVE_PCI
-       bool
-
 config TRACE_IRQFLAGS_SUPPORT
        def_bool y
 
@@ -541,24 +539,4 @@ config FORCE_MAX_ZONEORDER
        default "12" if ARC_HUGEPAGE_16M
        default "11"
 
-menu "Bus Support"
-
-config PCI
-       bool "PCI support" if MIGHT_HAVE_PCI
-       help
-         PCI is the name of a bus system, i.e., the way the CPU talks to
-         the other stuff inside your box.  Find out if your board/platform
-         has PCI.
-
-         Note: PCIe support for Synopsys Device will be available only
-         when HAPS DX is configured with PCIe RC bitmap. If you have PCI,
-         say Y, otherwise N.
-
-config PCI_SYSCALL
-       def_bool PCI
-
-source "drivers/pci/Kconfig"
-
-endmenu
-
 source "kernel/power/Kconfig"