diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 23:14:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 23:14:23 -0400 |
| commit | a9cf7cd0d7474026d05296c666a0b7f83d798c03 (patch) | |
| tree | afaf5041d3efabb5f5b0032d5b0e67ffacd84c28 /drivers/usb/serial/mos7720.c | |
| parent | 62b6e9ff08ced882b36c9583e350699f28912e51 (diff) | |
| parent | 69806d5631b79ed0c442ae5b15c46bcfd8662476 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: new Novatel device ids for option driver
USB: berry_charge: correct dbg string for second magic command
usblp: quirk flag and device entry for Seiko Epson M129C printer
airprime: USB ID for Novatel EV620 mini PCI-E card
USB: necessary update for mos7720 driver
USB: RAZR v3i unusual_devs
USB: two more device ids for dm9601 usbnet driver
USB: fix usb-serial regression
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 2d588fb82573..19bf403f9db2 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
| @@ -1628,6 +1628,7 @@ static struct usb_serial_driver moschip7720_2port_driver = { | |||
| 1628 | .chars_in_buffer = mos7720_chars_in_buffer, | 1628 | .chars_in_buffer = mos7720_chars_in_buffer, |
| 1629 | .break_ctl = mos7720_break, | 1629 | .break_ctl = mos7720_break, |
| 1630 | .read_bulk_callback = mos7720_bulk_in_callback, | 1630 | .read_bulk_callback = mos7720_bulk_in_callback, |
| 1631 | .read_int_callback = mos7720_interrupt_callback, | ||
| 1631 | }; | 1632 | }; |
| 1632 | 1633 | ||
| 1633 | static int __init moschip7720_init(void) | 1634 | static int __init moschip7720_init(void) |