diff options
| author | Michal Nazarewicz <m.nazarewicz@samsung.com> | 2010-01-22 09:18:21 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-16 18:11:08 -0500 |
| commit | dbe4a99d846e565f0f99914cc82658cd9ce60bdc (patch) | |
| tree | fe16872ba8a439a1b7c6da68cfcea6ca6bb03b70 /drivers/usb | |
| parent | 5a5e0f4c7038168e38d1db6af09d1ac715ee9888 (diff) | |
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 <m.nazarewicz@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/multi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 429560100b10..76496f5d272c 100644 --- a/drivers/usb/gadget/multi.c +++ b/drivers/usb/gadget/multi.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #if defined USB_ETH_RNDIS | 29 | #if defined USB_ETH_RNDIS |
| 30 | # undef USB_ETH_RNDIS | 30 | # undef USB_ETH_RNDIS |
| 31 | #endif | 31 | #endif |
| 32 | #ifdef CONFIG_USB_ETH_RNDIS | 32 | #ifdef CONFIG_USB_G_MULTI_RNDIS |
| 33 | # define USB_ETH_RNDIS y | 33 | # define USB_ETH_RNDIS y |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||