projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a5e0f4
)
USB: g_multi: fix CONFIG_USB_G_MULTI_RNDIS usage
author
Michal Nazarewicz
<
[email protected]
>
Fri, 22 Jan 2010 14:18:21 +0000
(15:18 +0100)
committer
Greg Kroah-Hartman
<
[email protected]
>
Tue, 16 Feb 2010 23:11:08 +0000
(15:11 -0800)
g_multi used CONFIG_USB_ETH_RNDIS to check if RNDIS option was requested
where it should check for CONFIG_USB_G_MULTI_RNDIS. As a result, RNDIS
was never present in g_multi regardless of configuration.
This fixes changes made in commit
396cda90d228d0851f3d64c7c85a1ecf6b8ae1e8
.
Signed-off-by: Michal Nazarewicz <
[email protected]
>
Cc: Marek Szyprowski <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/usb/gadget/multi.c
patch
|
blob
|
history
diff --git
a/drivers/usb/gadget/multi.c
b/drivers/usb/gadget/multi.c
index 429560100b10fc048a9e6c92d65efeac51effe20..76496f5d272c59cebd3856aa8cce245d5c4352f3 100644
(file)
--- a/
drivers/usb/gadget/multi.c
+++ b/
drivers/usb/gadget/multi.c
@@
-29,7
+29,7
@@
#if defined USB_ETH_RNDIS
# undef USB_ETH_RNDIS
#endif
-#ifdef CONFIG_USB_
ETH
_RNDIS
+#ifdef CONFIG_USB_
G_MULTI
_RNDIS
# define USB_ETH_RNDIS y
#endif