Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / drivers / rapidio / Kconfig

diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 0b2d2c3..070211a 100644 (file)
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -1,18 +1,34 @@
 #
 # RapidIO configuration
 #
-config RAPIDIO_8_BIT_TRANSPORT
-       bool "8-bit transport addressing"
-       depends on RAPIDIO
-       ---help---
-         By default, the kernel assumes a 16-bit addressed RapidIO
-         network. By selecting this option, the kernel will support
-         an 8-bit addressed network.
-
 config RAPIDIO_DISC_TIMEOUT
        int "Discovery timeout duration (seconds)"
        depends on RAPIDIO
        default "30"
        ---help---
          Amount of time a discovery node waits for a host to complete
-         enumeration beforing giving up.
+         enumeration before giving up.
+
+config RAPIDIO_ENABLE_RX_TX_PORTS
+       bool "Enable RapidIO Input/Output Ports"
+       depends on RAPIDIO
+       ---help---
+         The RapidIO specification describes a Output port transmit
+         enable and a Input port receive enable. The recommended state
+         for Input ports and Output ports should be disabled. When
+         this switch is set the RapidIO subsystem will enable all
+         ports for Input/Output direction to allow other traffic
+         than Maintenance transfers.
+
+source "drivers/rapidio/switches/Kconfig"
+
+config RAPIDIO_DEBUG
+       bool "RapidIO subsystem debug messages"
+       depends on RAPIDIO
+       help
+         Say Y here if you want the RapidIO subsystem to produce a bunch of
+         debug messages to the system log. Select this if you are having a
+         problem with the RapidIO subsystem and want to see more of what is
+         going on.
+
+         If you are unsure about this, say N here.