diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-06 14:11:04 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 08:34:48 -0400 |
commit | 03e42bd5937c4c24e411690ab165627e93c258b5 (patch) | |
tree | b28ce26b26167ceeb4d3dc83dc424fd2e2ecb973 /include | |
parent | c2ec75c25112c9e0d9053f55ba8cf0a358d4a354 (diff) |
usb: gadget: move bind() callback back to struct usb_composite_driver
This partly reverts 07a18bd7 ("usb gadget: don't save bind callback in
struct usb_composite_driver") and fixes new drivers. The section missmatch
problems was solved by whitelisting structs in question via __ref.
Cc: devel@driverdev.osuosl.org
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb/composite.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 3153f73ae083..19a5adf18bf4 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h | |||
@@ -305,8 +305,7 @@ struct usb_composite_driver { | |||
305 | void (*resume)(struct usb_composite_dev *); | 305 | void (*resume)(struct usb_composite_dev *); |
306 | }; | 306 | }; |
307 | 307 | ||
308 | extern int usb_composite_probe(struct usb_composite_driver *driver, | 308 | extern int usb_composite_probe(struct usb_composite_driver *driver); |
309 | int (*bind)(struct usb_composite_dev *cdev)); | ||
310 | extern void usb_composite_unregister(struct usb_composite_driver *driver); | 309 | extern void usb_composite_unregister(struct usb_composite_driver *driver); |
311 | extern void usb_composite_setup_continue(struct usb_composite_dev *cdev); | 310 | extern void usb_composite_setup_continue(struct usb_composite_dev *cdev); |
312 | 311 | ||