diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/serial/navman.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/serial/navman.c')
| -rw-r--r-- | drivers/usb/serial/navman.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index ac3f8b5d2c49..0610409a6568 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c | |||
| @@ -32,7 +32,7 @@ static struct usb_driver navman_driver = { | |||
| 32 | .no_dynamic_id = 1, | 32 | .no_dynamic_id = 1, |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | static void navman_read_int_callback(struct urb *urb, struct pt_regs *regs) | 35 | static void navman_read_int_callback(struct urb *urb) |
| 36 | { | 36 | { |
| 37 | struct usb_serial_port *port = urb->context; | 37 | struct usb_serial_port *port = urb->context; |
| 38 | unsigned char *data = urb->transfer_buffer; | 38 | unsigned char *data = urb->transfer_buffer; |