Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 68b04cd38af42dbe4ee28e189633c3c50beb8873

Authored by Alexandre Bounine
Committed by Linus Torvalds
1 parent 933af4a6c4
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff

drivers/rapidio/rio.c
Diff comments   View file @ 68b04cd
... ... @@ -445,7 +445,6 @@
445 445 struct list_head *n;
446 446 struct rio_dev *rdev;
447 447  
448   - WARN_ON(in_interrupt());
449 448 spin_lock(&rio_global_list_lock);
450 449 n = from ? from->global_list.next : rio_devices.next;
451 450  
drivers/rapidio/switches/Kconfig
Diff comments   View file @ 68b04cd
... ... @@ -5,25 +5,25 @@
5 5 bool "IDT Tsi57x SRIO switches support"
6 6 depends on RAPIDIO
7 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  
10 10 config RAPIDIO_CPS_XX
11 11 bool "IDT CPS-xx SRIO switches support"
12 12 depends on RAPIDIO
13 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  
16 16 config RAPIDIO_TSI568
17 17 bool "Tsi568 SRIO switch support"
18 18 depends on RAPIDIO
19 19 default n
20 20 ---help---
21   - Includes support for ITD Tsi568 serial RapidIO switch.
  21 + Includes support for IDT Tsi568 serial RapidIO switch.
22 22  
23 23 config RAPIDIO_TSI500
24 24 bool "Tsi500 Parallel RapidIO switch support"
25 25 depends on RAPIDIO
26 26 default n
27 27 ---help---
28   - Includes support for ITD Tsi500 parallel RapidIO switch.
  28 + Includes support for IDT Tsi500 parallel RapidIO switch.