Prev: [PATCH -mm 5/5] RapidIO: Use default route value for CPS switches
Next: [PATCH -mm 0/5] RapidIO: Set of patches to current -mm tree
From: Alexandre Bounine on 3 May 2010 11:50

Signed-off-by: Alexandre Bounine <alexandre.bounine(a)idt.com>
Cc: Matt Porter <mporter(a)kernel.crashing.org>
Cc: Li Yang <leoli(a)freescale.com>
Cc: Kumar Gala <galak(a)kernel.crashing.org>
Cc: Thomas Moll <thomas.moll(a)sysgo.com>
---
drivers/rapidio/rio.c | 1 -
drivers/rapidio/switches/Kconfig | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 8fa732e..777e099 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -445,7 +445,6 @@ static struct rio_dev *rio_get_comptag(u32 comp_tag, struct rio_dev *from)
struct list_head *n;
struct rio_dev *rdev;

- WARN_ON(in_interrupt());
spin_lock(&rio_global_list_lock);
n = from ? from->global_list.next : rio_devices.next;

diff --git a/drivers/rapidio/switches/Kconfig b/drivers/rapidio/switches/Kconfig
index 6969f39..2b4e9b2 100644
--- a/drivers/rapidio/switches/Kconfig
+++ b/drivers/rapidio/switches/Kconfig
@@ -5,24 +5,24 @@ config RAPIDIO_TSI57X
bool "IDT Tsi57x SRIO switches support"
depends on RAPIDIO
---help---
- Includes support for ITD Tsi57x family of serial RapidIO switches.
+ Includes support for IDT Tsi57x family of serial RapidIO switches.

config RAPIDIO_CPS_XX
bool "IDT CPS-xx SRIO switches support"
depends on RAPIDIO
---help---
- Includes support for ITD CPS-16/12/10/8 serial RapidIO switches.
+ Includes support for IDT CPS-16/12/10/8 serial RapidIO switches.

config RAPIDIO_TSI568
bool "Tsi568 SRIO switch support"
depends on RAPIDIO
default n
---help---
- Includes support for ITD Tsi568 serial RapidIO switch.
+ Includes support for IDT Tsi568 serial RapidIO switch.

config RAPIDIO_TSI500
bool "Tsi500 Parallel RapidIO switch support"
depends on RAPIDIO
default n
---help---
- Includes support for ITD Tsi500 parallel RapidIO switch.
+ Includes support for IDT Tsi500 parallel RapidIO switch.
--
1.7.0.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH -mm 5/5] RapidIO: Use default route value for CPS switches
Next: [PATCH -mm 0/5] RapidIO: Set of patches to current -mm tree