summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/usb-wwan.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 07:04:34 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 07:04:34 +0200
commitfc600432cd23e35c85de2ff4468d816d6938a112 (patch)
treec191c51e4458ec31c1d8254f01e23b2e1574b6f4 /drivers/usb/serial/usb-wwan.h
parentASoC: omap-mcbsp: Single macro for st channel volume set/get (diff)
parentLinux 3.6-rc4 (diff)
downloadlinux-fc600432cd23e35c85de2ff4468d816d6938a112.tar.xz
linux-fc600432cd23e35c85de2ff4468d816d6938a112.zip
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'drivers/usb/serial/usb-wwan.h')
-rw-r--r--drivers/usb/serial/usb-wwan.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h
index c47b6ec03063..1f034d2397c6 100644
--- a/drivers/usb/serial/usb-wwan.h
+++ b/drivers/usb/serial/usb-wwan.h
@@ -9,8 +9,7 @@ extern void usb_wwan_dtr_rts(struct usb_serial_port *port, int on);
extern int usb_wwan_open(struct tty_struct *tty, struct usb_serial_port *port);
extern void usb_wwan_close(struct usb_serial_port *port);
extern int usb_wwan_startup(struct usb_serial *serial);
-extern void usb_wwan_disconnect(struct usb_serial *serial);
-extern void usb_wwan_release(struct usb_serial *serial);
+extern int usb_wwan_port_remove(struct usb_serial_port *port);
extern int usb_wwan_write_room(struct tty_struct *tty);
extern void usb_wwan_set_termios(struct tty_struct *tty,
struct usb_serial_port *port,