From 50bdc07228ad4d035b5681a245308f2589318da2 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@mindspring.com>
Date: Thu, 25 Jan 2007 19:34:52 -0500
Subject: [PATCH] --- yaml --- r: 48735 b: refs/heads/master c:
 7fe89e9cc8ebd9da70f760409a4301d26f80a460 h: refs/heads/master i:   48733:
 5a48f011ed270ec2ae3db7526ca886983707cf6f   48731:
 4acc242002ada46ac900d2ea34db7ab4f43083c7   48727:
 1656fefd440b099d9018cb48048e0d4e6dff022d   48719:
 4c2580d398096096784a2e272fa6a3cb462ccbd2   48703:
 f0c1e087fd29c0a9290b27b494673070e6a853c9 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/core/otg_whitelist.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5c8373bf77da..e0024fe17e97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 253ca923281aec6975ec4028ddbc58e865d8d13d
+refs/heads/master: 7fe89e9cc8ebd9da70f760409a4301d26f80a460
diff --git a/trunk/drivers/usb/core/otg_whitelist.h b/trunk/drivers/usb/core/otg_whitelist.h
index 627a5a2fc9cf..7f31a495a25d 100644
--- a/trunk/drivers/usb/core/otg_whitelist.h
+++ b/trunk/drivers/usb/core/otg_whitelist.h
@@ -31,7 +31,7 @@ static struct usb_device_id whitelist_table [] = {
 { USB_DEVICE_INFO(7, 1, 3) },
 #endif
 
-#ifdef	CONFIG_USB_CDCETHER
+#ifdef	CONFIG_USB_NET_CDCETHER
 /* Linux-USB CDC Ethernet gadget */
 { USB_DEVICE(0x0525, 0xa4a1), },
 /* Linux-USB CDC Ethernet + RNDIS gadget */