summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2010-05-26 14:44:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 09:12:51 -0700
commit68b04cd38af42dbe4ee28e189633c3c50beb8873 (patch)
tree78dddeb66066b3f56e4ddcb693e9e54a85b56210
parent933af4a6c4913ab4c0691c8fb27fc305063889cd (diff)
downloadop-kernel-dev-68b04cd38af42dbe4ee28e189633c3c50beb8873.zip
op-kernel-dev-68b04cd38af42dbe4ee28e189633c3c50beb8873.tar.gz
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 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.
OpenPOWER on IntegriCloud