diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /drivers/usb/gadget/u_serial.h | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
| download | op-kernel-dev-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.zip op-kernel-dev-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.gz | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'drivers/usb/gadget/u_serial.h')
| -rw-r--r-- | drivers/usb/gadget/u_serial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/u_serial.h b/drivers/usb/gadget/u_serial.h index af3910d..300f0ed 100644 --- a/drivers/usb/gadget/u_serial.h +++ b/drivers/usb/gadget/u_serial.h @@ -62,5 +62,6 @@ void gserial_disconnect(struct gserial *); /* functions are bound to configurations by a config or gadget driver */ int acm_bind_config(struct usb_configuration *c, u8 port_num); int gser_bind_config(struct usb_configuration *c, u8 port_num); +int obex_bind_config(struct usb_configuration *c, u8 port_num); #endif /* __U_SERIAL_H */ |
