aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2010-05-26 17:44:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 12:12:51 -0400
commit68b04cd38af42dbe4ee28e189633c3c50beb8873 (patch)
tree78dddeb66066b3f56e4ddcb693e9e54a85b56210
parent933af4a6c4913ab4c0691c8fb27fc305063889cd (diff)
rapidio: fix typos and minor edits
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Li Yang <leoli@freescale.com> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Thomas Moll <thomas.moll@sysgo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rapidio/rio.c1
-rw-r--r--drivers/rapidio/switches/Kconfig8
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 8fa732e46bf6..777e099a3d8f 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)
445 struct list_head *n; 445 struct list_head *n;
446 struct rio_dev *rdev; 446 struct rio_dev *rdev;
447 447
448 WARN_ON(in_interrupt());
449 spin_lock(&rio_global_list_lock); 448 spin_lock(&rio_global_list_lock);
450 n = from ? from->global_list.next : rio_devices.next; 449 n = from ? from->global_list.next : rio_devices.next;
451 450
diff --git a/drivers/rapidio/switches/Kconfig b/drivers/rapidio/switches/Kconfig
index 6969f398bc26..2b4e9b2b6631 100644
--- a/drivers/rapidio/switches/Kconfig
+++ b/drivers/rapidio/switches/Kconfig
@@ -5,24 +5,24 @@ config RAPIDIO_TSI57X
5 bool "IDT Tsi57x SRIO switches support" 5 bool "IDT Tsi57x SRIO switches support"
6 depends on RAPIDIO 6 depends on RAPIDIO
7 ---help--- 7 ---help---
8 Includes support for ITD Tsi57x family of serial RapidIO switches. 8 Includes support for IDT Tsi57x family of serial RapidIO switches.
9 9
10config RAPIDIO_CPS_XX 10config RAPIDIO_CPS_XX
11 bool "IDT CPS-xx SRIO switches support" 11 bool "IDT CPS-xx SRIO switches support"
12 depends on RAPIDIO 12 depends on RAPIDIO
13 ---help--- 13 ---help---
14 Includes support for ITD CPS-16/12/10/8 serial RapidIO switches. 14 Includes support for IDT CPS-16/12/10/8 serial RapidIO switches.
15 15
16config RAPIDIO_TSI568 16config RAPIDIO_TSI568
17 bool "Tsi568 SRIO switch support" 17 bool "Tsi568 SRIO switch support"
18 depends on RAPIDIO 18 depends on RAPIDIO
19 default n 19 default n
20 ---help--- 20 ---help---
21 Includes support for ITD Tsi568 serial RapidIO switch. 21 Includes support for IDT Tsi568 serial RapidIO switch.
22 22
23config RAPIDIO_TSI500 23config RAPIDIO_TSI500
24 bool "Tsi500 Parallel RapidIO switch support" 24 bool "Tsi500 Parallel RapidIO switch support"
25 depends on RAPIDIO 25 depends on RAPIDIO
26 default n 26 default n
27 ---help--- 27 ---help---
28 Includes support for ITD Tsi500 parallel RapidIO switch. 28 Includes support for IDT Tsi500 parallel RapidIO switch.