summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPaul Fulghum <paulkf@microgate.com>2006-04-12 23:41:59 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-04-17 13:16:06 -0700
commit49fa79e5689a5c9089a5cdaf396fbdae5f928004 (patch)
tree13dbbcafcb7b987d7265a28e3bda53f428faa2d7 /drivers
parent6b2467e45179a336f1e5b70d2b2ae1fe89a00133 (diff)
downloadkernel-common-49fa79e5689a5c9089a5cdaf396fbdae5f928004.tar.gz
kernel-common-49fa79e5689a5c9089a5cdaf396fbdae5f928004.tar.bz2
kernel-common-49fa79e5689a5c9089a5cdaf396fbdae5f928004.zip
[PATCH] USB: remove __init from usb_console_setup
This prevents an Oops if booted with "console=ttyUSB0" but without a USB-serial dongle, and plugged one in afterwards. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/console.c2
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;
* serial.c code, except that the specifier is "ttyUSB" instead
* of "ttyS".
*/
-static int __init usb_console_setup(struct console *co, char *options)
+static int usb_console_setup(struct console *co, char *options)
{
struct usbcons_info *info = &usbcons_info;
int baud = 9600;