瀏覽代碼

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>
Alexandre Bounine 11 年之前
父節點
當前提交
56abde7239
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      arch/mips/Kconfig
  2. 2 2
      arch/powerpc/Kconfig

+ 1 - 1
arch/mips/Kconfig

@@ -2430,7 +2430,7 @@ source "drivers/pcmcia/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
 
 
 config RAPIDIO
 config RAPIDIO
-	bool "RapidIO support"
+	tristate "RapidIO support"
 	depends on PCI
 	depends on PCI
 	default n
 	default n
 	help
 	help

+ 2 - 2
arch/powerpc/Kconfig

@@ -794,7 +794,7 @@ config HAS_RAPIDIO
 	default n
 	default n
 
 
 config RAPIDIO
 config RAPIDIO
-	bool "RapidIO support"
+	tristate "RapidIO support"
 	depends on HAS_RAPIDIO || PCI
 	depends on HAS_RAPIDIO || PCI
 	help
 	help
 	  If you say Y here, the kernel will include drivers and
 	  If you say Y here, the kernel will include drivers and
@@ -802,7 +802,7 @@ config RAPIDIO
 
 
 config FSL_RIO
 config FSL_RIO
 	bool "Freescale Embedded SRIO Controller support"
 	bool "Freescale Embedded SRIO Controller support"
-	depends on RAPIDIO && HAS_RAPIDIO
+	depends on RAPIDIO = y && HAS_RAPIDIO
 	default "n"
 	default "n"
 	---help---
 	---help---
 	  Include support for RapidIO controller on Freescale embedded
 	  Include support for RapidIO controller on Freescale embedded