From 2f5c1bd07c9a9b12fec10808ea3d4836d4fa1d3c Mon Sep 17 00:00:00 2001
From: Zhang Wei <wei.zhang@freescale.com>
Date: Fri, 18 Apr 2008 13:33:39 -0700
Subject: [PATCH] --- yaml --- r: 94795 b: refs/heads/master c:
 f1f389d558d3884be565f152e9dd756e57b23d50 h: refs/heads/master i:   94793:
 13d5a88a2e792f61e668c185cd3cfdab53b3c277   94791:
 1cd7ca42937dceb75020909fd2c07774ab649bdf v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/Kconfig                | 13 +++++++++++++
 trunk/arch/powerpc/platforms/86xx/Kconfig |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 57682a73a08b..b3b72006d677 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d02443a6f89dbd7ff868db30ad18f90bb633f716
+refs/heads/master: f1f389d558d3884be565f152e9dd756e57b23d50
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 4e40c122bf26..3934e2659407 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/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/trunk/arch/powerpc/platforms/86xx/Kconfig b/trunk/arch/powerpc/platforms/86xx/Kconfig
index 7442c58d44f5..053f49a1dcae 100644
--- a/trunk/arch/powerpc/platforms/86xx/Kconfig
+++ b/trunk/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.