diff options
author | Alexandre Bounine <alexandre.bounine@idt.com> | 2011-03-23 19:43:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 22:46:42 -0400 |
commit | 388b78adc9899f0299128610f566051d0b1a57f6 (patch) | |
tree | f64e7151235c82ae3652fc5b4ca23c2a017ff464 /arch/x86 | |
parent | f8f0626989c85b3d8bd67eff29d9dd3d14a5e71f (diff) |
rapidio: modify configuration to support PCI-SRIO controller
1. Add an option to include RapidIO support if the PCI is available.
2. Add FSL_RIO configuration option to enable controller selection.
3. Add RapidIO support option into x86 and MIPS architectures.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Micha Nelissen <micha@neli.hopto.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d57ddd7573cc..140e254fe546 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -2096,6 +2096,16 @@ source "drivers/pcmcia/Kconfig" | |||
2096 | 2096 | ||
2097 | source "drivers/pci/hotplug/Kconfig" | 2097 | source "drivers/pci/hotplug/Kconfig" |
2098 | 2098 | ||
2099 | config RAPIDIO | ||
2100 | bool "RapidIO support" | ||
2101 | depends on PCI | ||
2102 | default n | ||
2103 | help | ||
2104 | If you say Y here, the kernel will include drivers and | ||
2105 | infrastructure code to support RapidIO interconnect devices. | ||
2106 | |||
2107 | source "drivers/rapidio/Kconfig" | ||
2108 | |||
2099 | endmenu | 2109 | endmenu |
2100 | 2110 | ||
2101 | 2111 | ||