Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317303
b: refs/heads/master
c: 8b9ba6e
h: refs/heads/master
i:
  317301: b03152c
  317299: 821be74
  317295: cd494ba
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent e531a8b commit 19a5114
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 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: 0c16ae762990660c4dfd7515e3d46b4249f535f0
refs/heads/master: 8b9ba6e5efc3213f384cda155861a4f7ae903365
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ static inline struct comedi_subdevice *comedi_get_write_subdevice(
return info->device->write_subdev;
}

int comedi_alloc_subdevices(struct comedi_device *, unsigned int);
int comedi_alloc_subdevices(struct comedi_device *, int);

void comedi_device_detach(struct comedi_device *dev);
int comedi_device_attach(struct comedi_device *dev,
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s);

struct comedi_driver *comedi_drivers;

int comedi_alloc_subdevices(struct comedi_device *dev,
unsigned int num_subdevices)
int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices)
{
unsigned i;
int i;

dev->n_subdevices = num_subdevices;
dev->subdevices =
Expand Down

0 comments on commit 19a5114

Please sign in to comment.