---

yaml --- r: 198808 b: refs/heads/master c: 68b04cd h: refs/heads/master v: v3
git-mirror · May 27, 2010 · d9263dd · d9263dd
1 parent 5c07052
commit d9263dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 933af4a6c4913ab4c0691c8fb27fc305063889cd
+refs/heads/master: 68b04cd38af42dbe4ee28e189633c3c50beb8873
diff --git a/trunk/drivers/rapidio/rio.c b/trunk/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/trunk/drivers/rapidio/switches/Kconfig b/trunk/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.