aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2014-01-23 18:56:04 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 19:37:03 -0500
commit56abde7239cb76d4dffcb79c8f96c1dab1cc81d1 (patch)
tree8bc4d31bd0e7a3bffbffe83e862cec22cc8c87fb
parent6c5de79ba22bbde9a3cfc7b405140763a7252410 (diff)
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>
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/powerpc/Kconfig4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 92c8e0b2bb4f..52dac06ea6b4 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2430,7 +2430,7 @@ source "drivers/pcmcia/Kconfig"
2430source "drivers/pci/hotplug/Kconfig" 2430source "drivers/pci/hotplug/Kconfig"
2431 2431
2432config RAPIDIO 2432config RAPIDIO
2433 bool "RapidIO support" 2433 tristate "RapidIO support"
2434 depends on PCI 2434 depends on PCI
2435 default n 2435 default n
2436 help 2436 help
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b2be8e8cb5c7..bedc62b44aa6 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -794,7 +794,7 @@ config HAS_RAPIDIO
794 default n 794 default n
795 795
796config RAPIDIO 796config RAPIDIO
797 bool "RapidIO support" 797 tristate "RapidIO support"
798 depends on HAS_RAPIDIO || PCI 798 depends on HAS_RAPIDIO || PCI
799 help 799 help
800 If you say Y here, the kernel will include drivers and 800 If you say Y here, the kernel will include drivers and
@@ -802,7 +802,7 @@ config RAPIDIO
802 802
803config FSL_RIO 803config FSL_RIO
804 bool "Freescale Embedded SRIO Controller support" 804 bool "Freescale Embedded SRIO Controller support"
805 depends on RAPIDIO && HAS_RAPIDIO 805 depends on RAPIDIO = y && HAS_RAPIDIO
806 default "n" 806 default "n"
807 ---help--- 807 ---help---
808 Include support for RapidIO controller on Freescale embedded 808 Include support for RapidIO controller on Freescale embedded