diff options
| author | Michal Nazarewicz <m.nazarewicz@samsung.com> | 2010-08-12 17:43:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 10:21:24 -0700 |
| commit | e12995ec8f8d99f2a339541fc28998af2d60af0f (patch) | |
| tree | 3fea8a62234b906b115f0f0b85f481dc69f1108c /drivers/usb/gadget/webcam.c | |
| parent | a99d8a45bc2f495be45b8d417b795d7282a69091 (diff) | |
| download | kernel_samsung_smdk4412-e12995ec8f8d99f2a339541fc28998af2d60af0f.zip kernel_samsung_smdk4412-e12995ec8f8d99f2a339541fc28998af2d60af0f.tar.gz kernel_samsung_smdk4412-e12995ec8f8d99f2a339541fc28998af2d60af0f.tar.bz2 | |
USB: Revert "USB: gadget: section mismatch warning fixed"
This reverts a commit which proposed an invalid solution
for a section mismatch. Next 3 commits will fix it correctly.
Conflicts:
drivers/usb/gadget/mass_storage.c
Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/webcam.c')
| -rw-r--r-- | drivers/usb/gadget/webcam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c index de1deb7..288d211 100644 --- a/drivers/usb/gadget/webcam.c +++ b/drivers/usb/gadget/webcam.c @@ -308,7 +308,7 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = { * USB configuration */ -static int __ref +static int __init webcam_config_bind(struct usb_configuration *c) { return uvc_bind_config(c, uvc_control_cls, uvc_fs_streaming_cls, @@ -330,7 +330,7 @@ webcam_unbind(struct usb_composite_dev *cdev) return 0; } -static int __ref +static int __init webcam_bind(struct usb_composite_dev *cdev) { int ret; |