Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304449
b: refs/heads/master
c: 7711452
h: refs/heads/master
i:
  304447: f489f02
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 24, 2012
1 parent ab8cdae commit 72d193f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 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: abae41e6438b798e046d721b6ccdd55b4a398170
refs/heads/master: 771145262e9bbabb03bd71d34792546db0bd2813
20 changes: 8 additions & 12 deletions trunk/drivers/staging/comedi/drivers/c6xdigio.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,6 @@ union encvaluetype {

#define C6XDIGIO_TIME_OUT 20

static int c6xdigio_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int c6xdigio_detach(struct comedi_device *dev);
struct comedi_driver driver_c6xdigio = {
.driver_name = "c6xdigio",
.module = THIS_MODULE,
.attach = c6xdigio_attach,
.detach = c6xdigio_detach,
};

static void C6X_pwmInit(unsigned long baseAddr)
{
int timeout = 0;
Expand Down Expand Up @@ -518,17 +508,23 @@ static int c6xdigio_detach(struct comedi_device *dev)
return 0;
}

struct comedi_driver driver_c6xdigio = {
.driver_name = "c6xdigio",
.module = THIS_MODULE,
.attach = c6xdigio_attach,
.detach = c6xdigio_detach,
};

static int __init driver_c6xdigio_init_module(void)
{
return comedi_driver_register(&driver_c6xdigio);
}
module_init(driver_c6xdigio_init_module);

static void __exit driver_c6xdigio_cleanup_module(void)
{
comedi_driver_unregister(&driver_c6xdigio);
}

module_init(driver_c6xdigio_init_module);
module_exit(driver_c6xdigio_cleanup_module);

MODULE_AUTHOR("Comedi http://www.comedi.org");
Expand Down

0 comments on commit 72d193f

Please sign in to comment.