diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 04:45:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 04:45:50 +0100 |
| commit | e8b722f487589a1f60ca27adc695494f188d404e (patch) | |
| tree | be3897dceb9b7c0949a8917ab11eea2752375e3b /drivers/usb/serial/usb_debug.c | |
| parent | 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | linux-e8b722f487589a1f60ca27adc695494f188d404e.tar.gz linux-e8b722f487589a1f60ca27adc695494f188d404e.tar.bz2 linux-e8b722f487589a1f60ca27adc695494f188d404e.zip | |
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'drivers/usb/serial/usb_debug.c')
| -rw-r--r-- | drivers/usb/serial/usb_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index fc5d9952b03b..6c9cbb59552a 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c @@ -31,7 +31,7 @@ static struct usb_driver debug_driver = { .no_dynamic_id = 1, }; -int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port, +static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp) { port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE; |