diff options
author | Michal Nazarewicz <m.nazarewicz@samsung.com> | 2010-08-12 11:43:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:21:24 -0400 |
commit | e12995ec8f8d99f2a339541fc28998af2d60af0f (patch) | |
tree | 3fea8a62234b906b115f0f0b85f481dc69f1108c /drivers/usb/gadget/cdc2.c | |
parent | a99d8a45bc2f495be45b8d417b795d7282a69091 (diff) |
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/cdc2.c')
-rw-r--r-- | drivers/usb/gadget/cdc2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c index 1f5ba2fd4c1f..928137d3dbdc 100644 --- a/drivers/usb/gadget/cdc2.c +++ b/drivers/usb/gadget/cdc2.c | |||
@@ -129,7 +129,7 @@ static u8 hostaddr[ETH_ALEN]; | |||
129 | /* | 129 | /* |
130 | * We _always_ have both CDC ECM and CDC ACM functions. | 130 | * We _always_ have both CDC ECM and CDC ACM functions. |
131 | */ | 131 | */ |
132 | static int __ref cdc_do_config(struct usb_configuration *c) | 132 | static int __init cdc_do_config(struct usb_configuration *c) |
133 | { | 133 | { |
134 | int status; | 134 | int status; |
135 | 135 | ||
@@ -159,7 +159,7 @@ static struct usb_configuration cdc_config_driver = { | |||
159 | 159 | ||
160 | /*-------------------------------------------------------------------------*/ | 160 | /*-------------------------------------------------------------------------*/ |
161 | 161 | ||
162 | static int __ref cdc_bind(struct usb_composite_dev *cdev) | 162 | static int __init cdc_bind(struct usb_composite_dev *cdev) |
163 | { | 163 | { |
164 | int gcnum; | 164 | int gcnum; |
165 | struct usb_gadget *gadget = cdev->gadget; | 165 | struct usb_gadget *gadget = cdev->gadget; |