From d1a13905b42dbac8550aeef4e70f25298b80c49d Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 1 Nov 2012 18:34:40 +0000 Subject: [PATCH] --- yaml --- r: 337583 b: refs/heads/master c: 10ba619d90c31fe4216590013114ec4c8456e6d4 h: refs/heads/master i: 337581: a1307ecca5ee74f59a942f4b7eb3723bdffc2c52 337579: 22421362b4c0d776c3fcd8a337f5c563c1111a91 337575: bac9f23dcb929fa33fac6444fdc8672201cdd082 337567: 91b09e0bbe5c3e92f077ed009a7fbab56fcb8436 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/jr3_pci.c | 38 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 6fb471bcfdf5..39632b415cf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1d16659538a5e9788524322a601382d5e14f08a +refs/heads/master: 10ba619d90c31fe4216590013114ec4c8456e6d4 diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c index 9035e84029fc..c5d1d693d0df 100644 --- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c +++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c @@ -21,24 +21,26 @@ */ /* -Driver: jr3_pci -Description: JR3/PCI force sensor board -Author: Anders Blomdell -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 + * 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"