diff --git a/[refs] b/[refs]
index adccbaaa2299..f240de7ee1c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 088dc270e1da03744d977cbd9edd4311af142348
+refs/heads/master: 42d8a2d22bbaed80f1ade65a08e4e1097a111d4b
diff --git a/trunk/drivers/usb/core/usb.h b/trunk/drivers/usb/core/usb.h
index 67da6d0b316f..5162cb370215 100644
--- a/trunk/drivers/usb/core/usb.h
+++ b/trunk/drivers/usb/core/usb.h
@@ -40,7 +40,10 @@ extern int usb_port_resume(struct usb_device *dev);
 #else
 
 #define usb_suspend_both(udev, msg)	0
-#define usb_resume_both(udev)		0
+static inline int usb_resume_both(struct usb_device *udev)
+{
+	return 0;
+}
 #define usb_port_suspend(dev)		0
 #define usb_port_resume(dev)		0