summaryrefslogtreecommitdiffstats
path: root/drivers/usb
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-14 11:12:27 -0700
commit69a4bf7c9525e5c92c0ecda0db0373f30162b28f (patch)
tree0d3bde6844615ed2d086666ea2dd6accce3d73c1 /drivers/usb
parente853bf4af372afdae732c48be04a6b154f2de3d4 (diff)
downloadop-kernel-dev-69a4bf7c9525e5c92c0ecda0db0373f30162b28f.zip
op-kernel-dev-69a4bf7c9525e5c92c0ecda0db0373f30162b28f.tar.gz
[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/usb')
-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 167f8ec..8023bb7 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;
OpenPOWER on IntegriCloud