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

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

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index ee833e6f5ccb4a141a6b5655a335c6bc8b239206..e0d7d61779a6cd7f13b1a12ac742ab1d4d9147ed 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -19,7 +19,6 @@ config RISCV
        select ARCH_WANT_FRAME_POINTERS
        select CLONE_BACKWARDS
        select COMMON_CLK
-       select DMA_DIRECT_OPS
        select GENERIC_CLOCKEVENTS
        select GENERIC_CPU_DEVICES
        select GENERIC_IRQ_SHOW
@@ -39,8 +38,11 @@ config RISCV
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
        select HAVE_ARCH_TRACEHOOK
+       select HAVE_PCI
        select MODULES_USE_ELF_RELA if MODULES
        select THREAD_INFO_IN_TASK
+       select PCI_DOMAINS_GENERIC if PCI
+       select PCI_MSI if PCI
        select RISCV_TIMER
        select GENERIC_IRQ_MULTI_HANDLER
        select ARCH_HAS_PTE_SPECIAL
@@ -273,30 +275,8 @@ endchoice
 
 endmenu
 
-menu "Bus support"
-
-config PCI
-       bool "PCI support"
-       select PCI_MSI
-       help
-         This feature enables support for PCI bus system. If you say Y
-         here, the kernel will include drivers and infrastructure code
-         to support PCI bus devices.
-
-         If you don't know what to do here, say Y.
-
-config PCI_DOMAINS
-       def_bool PCI
-
-config PCI_DOMAINS_GENERIC
-       def_bool PCI
-
-source "drivers/pci/Kconfig"
-
-endmenu
-
 menu "Power management options"
 
-source kernel/power/Kconfig
+source "kernel/power/Kconfig"
 
 endmenu