diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/usb/class/usblp.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/usb/class/usblp.c')
| -rw-r--r-- | drivers/usb/class/usblp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 9cac11ca1bb7..a161d70e1e42 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c | |||
| @@ -271,7 +271,7 @@ static int proto_bias = -1; | |||
| 271 | * URB callback. | 271 | * URB callback. |
| 272 | */ | 272 | */ |
| 273 | 273 | ||
| 274 | static void usblp_bulk_read(struct urb *urb, struct pt_regs *regs) | 274 | static void usblp_bulk_read(struct urb *urb) |
| 275 | { | 275 | { |
| 276 | struct usblp *usblp = urb->context; | 276 | struct usblp *usblp = urb->context; |
| 277 | 277 | ||
| @@ -288,7 +288,7 @@ unplug: | |||
| 288 | wake_up_interruptible(&usblp->wait); | 288 | wake_up_interruptible(&usblp->wait); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static void usblp_bulk_write(struct urb *urb, struct pt_regs *regs) | 291 | static void usblp_bulk_write(struct urb *urb) |
| 292 | { | 292 | { |
| 293 | struct usblp *usblp = urb->context; | 293 | struct usblp *usblp = urb->context; |
| 294 | 294 | ||