Signed-Off-By: Matthias Urlichs <[EMAIL PROTECTED]>
---
drivers/usb/serial/option.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 96e6419..d5fba95 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -36,6 +36,8 @@
2006-06-01 v0.6.3 add Novatel Wireless
2006-06-01 v0.7 Option => GSM
2006-06-01 v0.7.1 add COBRA2
+ 2006-07-11 v0.7.2 Make driver short names unique
+ forgot .ioctl entry
Work sponsored by: Sigos GmbH, Germany <[EMAIL PROTECTED]>
@@ -65,6 +67,7 @@ #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/module.h>
#include <linux/usb.h>
+#include <linux/version.h>
#include "usb-serial.h"
/* Function prototypes */
@@ -154,7 +157,7 @@ static struct usb_driver option_driver =
static struct usb_serial_driver option_3port_device = {
.driver = {
.owner = THIS_MODULE,
- .name = "option",
+ .name = "option3",
},
.description = "GSM modem (3-port)",
.id_table = option_ids3,
@@ -169,6 +172,7 @@ static struct usb_serial_driver option_3
.chars_in_buffer = option_chars_in_buffer,
.throttle = option_rx_throttle,
.unthrottle = option_rx_unthrottle,
+ .ioctl = option_ioctl,
.set_termios = option_set_termios,
.break_ctl = option_break_ctl,
.tiocmget = option_tiocmget,
@@ -181,7 +185,7 @@ static struct usb_serial_driver option_3
static struct usb_serial_driver option_1port_device = {
.driver = {
.owner = THIS_MODULE,
- .name = "option",
+ .name = "option1",
},
.description = "GSM modem (1-port)",
.id_table = option_ids1,
@@ -656,7 +660,6 @@ static void option_setup_urbs(struct usb
dbg("%s", __FUNCTION__);
-
for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i];
portdata = usb_get_serial_port_data(port);
--
1.4.1.gbaac-dirty
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
