From 8709addffbf5d487fbaeb3cfa3b646dac49fcdaf Mon Sep 17 00:00:00 2001
From: Giridhar Pemmasani <giri@lmc.cs.sunysb.edu>
Date: Tue, 30 May 2006 10:12:30 -0400
Subject: [PATCH] --- yaml --- r: 28359 b: refs/heads/master c:
 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8 h: refs/heads/master i:   28357:
 02f88cd2d172e7a6b4fdeaebf786d5eabb672ed8   28355:
 a74c728f8baaaebca3df9e043442b5e31b059fa8   28351:
 1c03867c63dd5ce879b3ebc2c376dcc7d8416d36 v: v3

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

diff --git a/[refs] b/[refs]
index 4f007698d031..6cc450a99fb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fbe75e12f0dd567c86533e13ba2605f3ecad2e1
+refs/heads/master: 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 89ebe6a23a90..f41c08946a52 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -1241,7 +1241,7 @@ static int choose_configuration(struct usb_device *udev)
 				&& desc->bInterfaceClass == USB_CLASS_COMM
 				&& desc->bInterfaceSubClass == 2
 				&& desc->bInterfaceProtocol == 0xff) {
-#ifndef CONFIG_USB_NET_RNDIS
+#ifndef CONFIG_USB_NET_RNDIS_HOST
 			continue;
 #else
 			best = c;