Commit dbe4a99d authored Jan 22, 2010 by Michal Nazarewicz Committed by Greg Kroah-Hartman Feb 16, 2010

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 396cda90.

Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 5a5e0f4c

drivers/usb/gadget/multi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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