summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@fs.tum.de>2003-05-05 00:24:39 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2003-05-05 00:24:39 -0700
commit6abe9ab2fc875867fa5d62324c993b7bb7f98dc2 (patch)
tree9ef6dd4fe7fe2b09ff1ea52b6a0040fcb3f07dcf
parent7324c128b3f0f5013dd1f552a7a714d5a1bda50b (diff)
[PATCH] USB: kill the last occurances of usb_serial_get_by_minor
I got an error at the final linking of 2.5.68-bk11. It seems the patch below is needed.
-rw-r--r--drivers/usb/serial/console.c2
-rw-r--r--drivers/usb/serial/usb-serial.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 778ba16c57f0..7eeb2567bc4b 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -133,7 +133,7 @@ static int __init usb_console_setup(struct console *co, char *options)
co->cflag = cflag;
/* grab the first serial port that happens to be connected */
- serial = usb_serial_get_by_minor (0);
+ serial = usb_serial_get_by_index(0);
if (serial_paranoia_check (serial, __FUNCTION__)) {
/* no device is connected yet, sorry :( */
err ("No USB device connected to ttyUSB0");
diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
index 9547a61b8997..a1d1404f5371 100644
--- a/drivers/usb/serial/usb-serial.h
+++ b/drivers/usb/serial/usb-serial.h
@@ -280,7 +280,7 @@ static inline void usb_serial_console_exit (void) { }
#endif
/* Functions needed by other parts of the usbserial core */
-extern struct usb_serial *usb_serial_get_by_minor (unsigned int minor);
+extern struct usb_serial *usb_serial_get_by_index (unsigned int minor);
extern int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp);
extern int usb_serial_generic_write (struct usb_serial_port *port, int from_user, const unsigned char *buf, int count);
extern void usb_serial_generic_close (struct usb_serial_port *port, struct file *filp);