[patch 14/67] USB: Allow compile in g_ether, fix typo

Greg KH
2006-10-11T21:28:44Z

[-- Attachment #1: usb-allow-compile-in-g_ether-fix-typo.patch --]
[-- Type: text/plain, Size: 966 bytes --]

-stable review patch. If anyone has any objections, please let us know.

------------------
From: Tony Lindgren <tony@atomide.com>

Allows compiling g_ether in and fixes a typo with MUSB_HDRC

Signed-off-by: Tony Lindgren <tony@atomide.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
drivers/usb/gadget/ether.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.18.orig/drivers/usb/gadget/ether.c
+++ linux-2.6.18/drivers/usb/gadget/ether.c
@@ -262,7 +262,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethern
#define DEV_CONFIG_CDC
#endif

-#ifdef CONFIG_USB_GADGET_MUSBHDRC
+#ifdef CONFIG_USB_GADGET_MUSB_HDRC
#define DEV_CONFIG_CDC
#endif

@@ -2564,7 +2564,7 @@ static struct usb_gadget_driver eth_driv

.function = (char *) driver_desc,
.bind = eth_bind,
- .unbind = __exit_p(eth_unbind),
+ .unbind = eth_unbind,

.setup = eth_setup,
.disconnect = eth_disconnect,

--