From: Michal Nazarewicz Date: Fri, 22 Jan 2010 14:18:21 +0000 (+0100) Subject: USB: g_multi: fix CONFIG_USB_G_MULTI_RNDIS usage X-Git-Tag: v2.6.33~36^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbe4a99d846e565f0f99914cc82658cd9ce60bdc;p=platform%2Fkernel%2Flinux-stable.git USB: g_multi: fix CONFIG_USB_G_MULTI_RNDIS usage 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 Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 4295601..76496f5 100644 --- 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