diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:23 -0400 |
| commit | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (patch) | |
| tree | 27907bbd653504d71ff47cb00bdf8cd61e82f126 /drivers/usb/serial/console.c | |
| parent | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (diff) | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/usb/serial/console.c')
| -rw-r--r-- | drivers/usb/serial/console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index 167f8ec56131..8023bb7279b1 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c | |||
| @@ -54,7 +54,7 @@ static struct console usbcons; | |||
| 54 | * serial.c code, except that the specifier is "ttyUSB" instead | 54 | * serial.c code, except that the specifier is "ttyUSB" instead |
| 55 | * of "ttyS". | 55 | * of "ttyS". |
| 56 | */ | 56 | */ |
| 57 | static int __init usb_console_setup(struct console *co, char *options) | 57 | static int usb_console_setup(struct console *co, char *options) |
| 58 | { | 58 | { |
| 59 | struct usbcons_info *info = &usbcons_info; | 59 | struct usbcons_info *info = &usbcons_info; |
| 60 | int baud = 9600; | 60 | int baud = 9600; |