diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:31:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:31:55 -0500 |
| commit | 48fa4b8ecf683f5e411303553da9e186e8b8406e (patch) | |
| tree | 76cec4aa8cca18a44b1bd6e5be68c462a0e66d5f /drivers/usb/serial/usb_debug.c | |
| parent | d95f412200652694e63e64bfd49f0ae274a54479 (diff) | |
| parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) | |
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/usb_debug.c')
| -rw-r--r-- | drivers/usb/serial/usb_debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index f2ed6a31be77..95a82148ee81 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c | |||
| @@ -75,6 +75,7 @@ static struct usb_serial_driver debug_device = { | |||
| 75 | .name = "debug", | 75 | .name = "debug", |
| 76 | }, | 76 | }, |
| 77 | .id_table = id_table, | 77 | .id_table = id_table, |
| 78 | .usb_driver = &debug_driver, | ||
| 78 | .num_ports = 1, | 79 | .num_ports = 1, |
| 79 | .bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE, | 80 | .bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE, |
| 80 | .break_ctl = usb_debug_break_ctl, | 81 | .break_ctl = usb_debug_break_ctl, |