From d85c5948c0d7ec64ed656ff034e081966e32b628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E5vard=20Skinnemoen?= <hskinnemoen@atmel.com>
Date: Mon, 27 Feb 2006 18:15:04 +0100
Subject: [PATCH] --- yaml --- r: 46687 b: refs/heads/master c:
 ef3ff462a31987629c4d0488550fbbb66fbfcc35 h: refs/heads/master i:   46685:
 3c5dca80d709a846bb6f36f61059ce8902d4fde4   46683:
 2e41b3f8f3ac601310572060800e4385dc3c044a   46679:
 416bdaa36c071b7162c26cd2154b612b5c3d7c16   46671:
 e8a1635c380520ca0ebe84497c8539aa1e6b42da   46655:
 a79361ff283e3021268db1b7acf3fc94592d483f v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/gadget/ether.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d218857c209..99e2d75038a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f5b9cc9e4cf5847e7550c4079cebb80170e71dd
+refs/heads/master: ef3ff462a31987629c4d0488550fbbb66fbfcc35
diff --git a/trunk/drivers/usb/gadget/ether.c b/trunk/drivers/usb/gadget/ether.c
index 72e2b65293c8..22e3c9443641 100644
--- a/trunk/drivers/usb/gadget/ether.c
+++ b/trunk/drivers/usb/gadget/ether.c
@@ -279,6 +279,10 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
 #define DEV_CONFIG_CDC
 #endif
 
+#ifdef CONFIG_USB_GADGET_HUSB2DEV
+#define DEV_CONFIG_CDC
+#endif
+
 
 /* For CDC-incapable hardware, choose the simple cdc subset.
  * Anything that talks bulk (without notable bugs) can do this.