rapidio: consolidate RAPIDIO config entry in drivers/rapidio

There is no good reason to duplicate the RAPIDIO menu in various
architectures.  Instead provide a selectable HAVE_RAPIDIO symbol
that indicates native availability of RAPIDIO support and the handle
the rest in drivers/pci.  This also means we now provide support
for PCI(e) to Rapidio bridges for every architecture instead of a
limited subset.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

1 files changed, 1 insertions, 14 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3912250ff813..67fbd4952ff4 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -892,7 +892,7 @@ config CAVIUM_OCTEON_SOC
         bool "Cavium Networks Octeon SoC based boards"
         select CEVT_R4K
         select ARCH_HAS_PHYS_TO_DMA
-        select HAS_RAPIDIO
+        select HAVE_RAPIDIO
         select PHYS_ADDR_T_64BIT
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
@@ -3107,19 +3107,6 @@ config ZONE_DMA
 config ZONE_DMA32
         bool
 
-config HAS_RAPIDIO
-        bool
-        default n
-
-config RAPIDIO
-        tristate "RapidIO support"
-        depends on HAS_RAPIDIO || PCI
-        help
-          If you say Y here, the kernel will include drivers and
-          infrastructure code to support RapidIO interconnect devices.
-
-source "drivers/rapidio/Kconfig"
-
 endmenu
 
 config TRAD_SIGNALS