Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337583
b: refs/heads/master
c: 10ba619
h: refs/heads/master
i:
  337581: a1307ec
  337579: 2242136
  337575: bac9f23
  337567: 91b09e0
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 9cefea3 commit d1a1390
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1d16659538a5e9788524322a601382d5e14f08a
refs/heads/master: 10ba619d90c31fe4216590013114ec4c8456e6d4
38 changes: 20 additions & 18 deletions trunk/drivers/staging/comedi/drivers/jr3_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,26 @@
*/
/*
Driver: jr3_pci
Description: JR3/PCI force sensor board
Author: Anders Blomdell <anders.blomdell@control.lth.se>
Status: works
Devices: [JR3] PCI force sensor board (jr3_pci)
The DSP on the board requires initialization code, which can
be loaded by placing it in /lib/firmware/comedi.
The initialization code should be somewhere on the media you got
with your card. One version is available from http://www.comedi.org
in the comedi_nonfree_firmware tarball.
Configuration options:
[0] - PCI bus number - if bus number and slot number are 0,
then driver search for first unused card
[1] - PCI slot number
*/
* Driver: jr3_pci
* Description: JR3/PCI force sensor board
* Author: Anders Blomdell <anders.blomdell@control.lth.se>
* Updated: Thu, 01 Nov 2012 17:34:55 +0000
* Status: works
* Devices: [JR3] PCI force sensor board (jr3_pci)
*
* Configuration options:
* None
*
* Manual configuration of comedi devices is not supported by this
* driver; supported PCI devices are configured as comedi devices
* automatically.
*
* The DSP on the board requires initialization code, which can be
* loaded by placing it in /lib/firmware/comedi. The initialization
* code should be somewhere on the media you got with your card. One
* version is available from http://www.comedi.org in the
* comedi_nonfree_firmware tarball. The file is called "jr3pci.idm".
*/

#include "../comedidev.h"

Expand Down

0 comments on commit d1a1390

Please sign in to comment.