From 1265013469a37c300fb5f0e364516547d293e778 Mon Sep 17 00:00:00 2001
From: Michal Nazarewicz <m.nazarewicz@samsung.com>
Date: Fri, 22 Jan 2010 15:18:21 +0100
Subject: [PATCH] --- yaml --- r: 180627 b: refs/heads/master c:
 dbe4a99d846e565f0f99914cc82658cd9ce60bdc h: refs/heads/master i:   180625:
 f6390d55610238c75d47b8eb2940e822be20d1a5   180623:
 011a41e446c716c95400fba6b08904018e149034 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/gadget/multi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ecb6bcfcebb0..556295e27f5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a5e0f4c7038168e38d1db6af09d1ac715ee9888
+refs/heads/master: dbe4a99d846e565f0f99914cc82658cd9ce60bdc
diff --git a/trunk/drivers/usb/gadget/multi.c b/trunk/drivers/usb/gadget/multi.c
index 429560100b10..76496f5d272c 100644
--- a/trunk/drivers/usb/gadget/multi.c
+++ b/trunk/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