From a615fd1f0d5c4dc161d16db2aa1f17b839695c77 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Sun, 2 Apr 2006 10:18:34 -0800
Subject: [PATCH] --- yaml --- r: 25743 b: refs/heads/master c:
 42795410c325108d59d0b1e750657197a7374c04 h: refs/heads/master i:   25741:
 19c46a3e14c7ae27f71c3a46f80aa19567f03b78   25739:
 1fcec6d4057b6d269394630e7ed4dc7b5e377948   25735:
 a5cf96b5c1bd0d3da4e7c2a6850e992a6b3eeba2   25727:
 a3c4671400f8c4c064d59f0c8e28d37f75b6158b v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/usb/gadget/gadget_chips.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ed375c5cf6a5..d5672807bda1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89ccbdc91bc5a433fa256c0136fbe181d7c5d474
+refs/heads/master: 42795410c325108d59d0b1e750657197a7374c04
diff --git a/trunk/drivers/usb/gadget/gadget_chips.h b/trunk/drivers/usb/gadget/gadget_chips.h
index c4081407171f..aa80f0910720 100644
--- a/trunk/drivers/usb/gadget/gadget_chips.h
+++ b/trunk/drivers/usb/gadget/gadget_chips.h
@@ -100,9 +100,9 @@
 #define gadget_is_musbhsfc(g)	0
 #endif
 
-/* Mentor high speed "dual role" controller, peripheral mode */
-#ifdef CONFIG_USB_GADGET_MUSBHDRC
-#define gadget_is_musbhdrc(g)	!strcmp("musbhdrc_udc", (g)->name)
+/* Mentor high speed "dual role" controller, in peripheral role */
+#ifdef CONFIG_USB_GADGET_MUSB_HDRC
+#define gadget_is_musbhdrc(g)	!strcmp("musb_hdrc", (g)->name)
 #else
 #define gadget_is_musbhdrc(g)	0
 #endif