diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-05 15:49:57 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-05 15:50:05 -0500 |
| commit | 285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06 (patch) | |
| tree | 7eb4aeab927a25b6cc82aef21ffd5a4f4866ae4b /drivers/usb/serial/usb_debug.c | |
| parent | 1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff) | |
| parent | a9fe8d5fd52ecd17c3f3970bbcf6b3573f831898 (diff) | |
Merge branch 'irq/urgent' into irq/core
Reason: Get mainline fixes integrated. Further patches conflict with
them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 f2ed6a31be7..95a82148ee8 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, |