diff --git a/[refs] b/[refs]
index 9d99f31c104a..ed2582f15653 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 499aaae000ef466150a58f31b28f88087da123e6
+refs/heads/master: fc184a35d90927fb82a13043a95c5420335ab824
diff --git a/trunk/drivers/staging/usbip/vhci.h b/trunk/drivers/staging/usbip/vhci.h
index f4834df94d15..d745c4ebd05c 100644
--- a/trunk/drivers/staging/usbip/vhci.h
+++ b/trunk/drivers/staging/usbip/vhci.h
@@ -100,16 +100,18 @@ struct vhci_hcd {
 
 extern struct vhci_hcd *the_controller;
 extern struct attribute_group dev_attr_group;
+#define hardware (&the_controller->pdev.dev)
 
 /* vhci_hcd.c */
 void rh_port_connect(int rhport, enum usb_device_speed speed);
 void rh_port_disconnect(int rhport);
-int vhci_rx_loop(void *data);
-int vhci_tx_loop(void *data);
 
+/* vhci_rx.c */
 struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum);
+int vhci_rx_loop(void *data);
 
-#define hardware (&the_controller->pdev.dev)
+/* vhci_tx.c */
+int vhci_tx_loop(void *data);
 
 static inline struct vhci_device *port_to_vdev(__u32 port)
 {