rapidio: add modular rapidio core build into powerpc and mips branches

[linux-drm-fsl-dcu.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b44b52c0a8f07d2854d5a21ca6fb2ecf409409c1..bedc62b44aa69b17c9b0b3c61457fc235cca6479 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -147,6 +147,10 @@ config EARLY_PRINTK
        bool
        default y
 
+config PANIC_TIMEOUT
+       int
+       default 180
+
 config COMPAT
        bool
        default y if PPC64
@@ -790,7 +794,7 @@ config HAS_RAPIDIO
        default n
 
 config RAPIDIO
-       bool "RapidIO support"
+       tristate "RapidIO support"
        depends on HAS_RAPIDIO || PCI
        help
          If you say Y here, the kernel will include drivers and
@@ -798,7 +802,7 @@ config RAPIDIO
 
 config FSL_RIO
        bool "Freescale Embedded SRIO Controller support"
-       depends on RAPIDIO && HAS_RAPIDIO
+       depends on RAPIDIO = y && HAS_RAPIDIO
        default "n"
        ---help---
          Include support for RapidIO controller on Freescale embedded