From 04d282f846f62b409f15b4894e41957b2d7d8d5e Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Wed, 1 Nov 2006 14:26:26 -0800
Subject: [PATCH] --- yaml --- r: 40683 b: refs/heads/master c:
 11bd44abbd204f580ea91e75c84e012988971012 h: refs/heads/master i:   40681:
 3181f8abddf069a9f9945ffb37fd1e983e239ecd   40679:
 aef49686aaaf72060cdd8c650e13f045a2de43e6 v: v3

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

diff --git a/[refs] b/[refs]
index abc3c81dcfab..aed6cd54c14c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23b0d968c2c82c2574ca97148ce092eff4ab84a6
+refs/heads/master: 11bd44abbd204f580ea91e75c84e012988971012
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 66bff184a30c..ba165aff9ea4 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -1188,6 +1188,7 @@ static inline void show_string(struct usb_device *udev, char *id, char *string)
 
 #ifdef	CONFIG_USB_OTG
 #include "otg_whitelist.h"
+static int __usb_port_suspend(struct usb_device *, int port1);
 #endif
 
 /**
@@ -1289,8 +1290,6 @@ int usb_new_device(struct usb_device *udev)
 		 * (Includes HNP test device.)
 		 */
 		if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
-			static int __usb_port_suspend(struct usb_device *,
-						int port1);
 			err = __usb_port_suspend(udev, udev->bus->otg_port);
 			if (err < 0)
 				dev_dbg(&udev->dev, "HNP fail, %d\n", err);