diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/parport/share.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/parport/share.c')
| -rw-r--r-- | drivers/parport/share.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/share.c b/drivers/parport/share.c index 94dc506b83d1..fd9129e424f9 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c | |||
| @@ -519,7 +519,7 @@ void parport_remove_port(struct parport *port) | |||
| 519 | struct pardevice * | 519 | struct pardevice * |
| 520 | parport_register_device(struct parport *port, const char *name, | 520 | parport_register_device(struct parport *port, const char *name, |
| 521 | int (*pf)(void *), void (*kf)(void *), | 521 | int (*pf)(void *), void (*kf)(void *), |
| 522 | void (*irq_func)(int, void *, struct pt_regs *), | 522 | void (*irq_func)(int, void *), |
| 523 | int flags, void *handle) | 523 | int flags, void *handle) |
| 524 | { | 524 | { |
| 525 | struct pardevice *tmp; | 525 | struct pardevice *tmp; |