rapidio: add modular rapidio core build into powerpc and mips branches

Allow modular build option for RapidIO subsystem core in MIPS and PowerPC
architectural branches.

At this moment modular RapidIO subsystem build is enabled only for
platforms that use PCI/PCIe based RapidIO controllers (e.g.  Tsi721).

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Jean Delvare <jdelvare@suse.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 92c8e0b..52dac06 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2430,7 +2430,7 @@ source "drivers/pcmcia/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
 
 config RAPIDIO
-       bool "RapidIO support"
+       tristate "RapidIO support"
        depends on PCI
        default n
        help

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b2be8e8..bedc62b 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -794,7 +794,7 @@ config HAS_RAPIDIO
        default n
 
 config RAPIDIO
-       bool "RapidIO support"
+       tristate "RapidIO support"
        depends on HAS_RAPIDIO || PCI
        help
          If you say Y here, the kernel will include drivers and
@@ -802,7 +802,7 @@ config RAPIDIO
 
 config FSL_RIO
        bool "Freescale Embedded SRIO Controller support"
-       depends on RAPIDIO && HAS_RAPIDIO
+       depends on RAPIDIO = y && HAS_RAPIDIO
        default "n"
        ---help---
          Include support for RapidIO controller on Freescale embedded