summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorZhang Wei <wei.zhang@freescale.com>2008-04-18 13:33:39 -0700
committerPaul Mackerras <paulus@samba.org>2008-04-29 19:40:27 +1000
commitf1f389d558d3884be565f152e9dd756e57b23d50 (patch)
tree6e5afa5ee03055c7b85f43b14aacb114be9ce71d /arch
parentd02443a6f89dbd7ff868db30ad18f90bb633f716 (diff)
downloadlinux-3.10-f1f389d558d3884be565f152e9dd756e57b23d50.tar.gz
linux-3.10-f1f389d558d3884be565f152e9dd756e57b23d50.tar.bz2
linux-3.10-f1f389d558d3884be565f152e9dd756e57b23d50.zip
[RAPIDIO] Add RapidIO option to kernel configuration
Signed-off-by: Zhang Wei <wei.zhang@freescale.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig13
-rw-r--r--arch/powerpc/platforms/86xx/Kconfig1
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 4e40c122bf2..3934e265940 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -608,6 +608,19 @@ source "drivers/pcmcia/Kconfig"
source "drivers/pci/hotplug/Kconfig"
+config HAS_RAPIDIO
+ bool
+ default n
+
+config RAPIDIO
+ bool "RapidIO support"
+ depends on HAS_RAPIDIO
+ help
+ If you say Y here, the kernel will include drivers and
+ infrastructure code to support RapidIO interconnect devices.
+
+source "drivers/rapidio/Kconfig"
+
endmenu
menu "Advanced setup"
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 7442c58d44f..053f49a1dca 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -8,6 +8,7 @@ config MPC8641_HPCN
select PPC_I8259
select DEFAULT_UIMAGE
select FSL_ULI1575
+ select HAS_RAPIDIO
help
This option enables support for the MPC8641 HPCN board.