git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (Andrew's incoming - part two)
[pandora-kernel.git]
/
drivers
/
rapidio
/
Kconfig
diff --git
a/drivers/rapidio/Kconfig
b/drivers/rapidio/Kconfig
index
070211a
..
bc87192
100644
(file)
--- a/
drivers/rapidio/Kconfig
+++ b/
drivers/rapidio/Kconfig
@@
-1,6
+1,8
@@
#
# RapidIO configuration
#
#
# RapidIO configuration
#
+source "drivers/rapidio/devices/Kconfig"
+
config RAPIDIO_DISC_TIMEOUT
int "Discovery timeout duration (seconds)"
depends on RAPIDIO
config RAPIDIO_DISC_TIMEOUT
int "Discovery timeout duration (seconds)"
depends on RAPIDIO
@@
-20,8
+22,6
@@
config RAPIDIO_ENABLE_RX_TX_PORTS
ports for Input/Output direction to allow other traffic
than Maintenance transfers.
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
config RAPIDIO_DEBUG
bool "RapidIO subsystem debug messages"
depends on RAPIDIO
@@
-32,3
+32,5
@@
config RAPIDIO_DEBUG
going on.
If you are unsure about this, say N here.
going on.
If you are unsure about this, say N here.
+
+source "drivers/rapidio/switches/Kconfig"