Skip to content

Commit

Permalink
rapidio: fix typos and minor edits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexandre Bounine authored and Linus Torvalds committed May 27, 2010
1 parent 933af4a commit 68b04cd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion drivers/rapidio/rio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions drivers/rapidio/switches/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit 68b04cd

Please sign in to comment.