Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325286
b: refs/heads/master
c: fcdd5ec
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 7a7f938 commit 96209f2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 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: 7ae09413c7195f87d02e7fd0a67ba6dafbab4546
refs/heads/master: fcdd5ecd66db871befa755df768bf43fbe38d383
17 changes: 7 additions & 10 deletions trunk/drivers/staging/comedi/drivers/ni_6527.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,6 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800
#define Rising_Edge_Detection_Enable(x) (0x018+(x))
#define Falling_Edge_Detection_Enable(x) (0x020+(x))

static int ni6527_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static void ni6527_detach(struct comedi_device *dev);
static struct comedi_driver ni6527_driver = {
.driver_name = DRIVER_NAME,
.module = THIS_MODULE,
.attach = ni6527_attach,
.detach = ni6527_detach,
};

struct ni6527_board {

int dev_id;
Expand Down Expand Up @@ -478,6 +468,13 @@ static int ni6527_find_device(struct comedi_device *dev, int bus, int slot)
return -EIO;
}

static struct comedi_driver ni6527_driver = {
.driver_name = DRIVER_NAME,
.module = THIS_MODULE,
.attach = ni6527_attach,
.detach = ni6527_detach,
};

static int __devinit ni6527_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
Expand Down

0 comments on commit 96209f2

Please sign in to comment.