Index: uspace/drv/bus/usb/ehci/hc.c
===================================================================
--- uspace/drv/bus/usb/ehci/hc.c	(revision c6f82e543978d3fafa47bd89b2e23a3d0a86cf50)
+++ uspace/drv/bus/usb/ehci/hc.c	(revision abb5d08b8dadddf815ac338a1b5357b8df0b66e6)
@@ -473,4 +473,12 @@
 }
 
+/**
+ * Setup roothub as a virtual hub.
+ */
+int hc_setup_roothub(hc_device_t *hcd)
+{
+	return hc_setup_virtual_root_hub(hcd, USB_SPEED_HIGH);
+}
+
 /** Initialize memory structures used by the EHCI hcd.
  *
Index: uspace/drv/bus/usb/ehci/hc.h
===================================================================
--- uspace/drv/bus/usb/ehci/hc.h	(revision c6f82e543978d3fafa47bd89b2e23a3d0a86cf50)
+++ uspace/drv/bus/usb/ehci/hc.h	(revision abb5d08b8dadddf815ac338a1b5357b8df0b66e6)
@@ -102,4 +102,5 @@
 int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
 int hc_start(hc_device_t *);
+int hc_setup_roothub(hc_device_t *);
 int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *);
 int hc_gone(hc_device_t *);
Index: uspace/drv/bus/usb/ehci/hw_struct/queue_head.c
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/queue_head.c	(revision c6f82e543978d3fafa47bd89b2e23a3d0a86cf50)
+++ uspace/drv/bus/usb/ehci/hw_struct/queue_head.c	(revision abb5d08b8dadddf815ac338a1b5357b8df0b66e6)
@@ -46,7 +46,4 @@
 	[USB_SPEED_FULL] = QH_EP_CHAR_EPS_FS,
 	[USB_SPEED_HIGH] = QH_EP_CHAR_EPS_HS,
-
-	/* Solely for the roothub */
-	[USB_SPEED_MAX] = 0,
 };
 
Index: uspace/drv/bus/usb/ehci/main.c
===================================================================
--- uspace/drv/bus/usb/ehci/main.c	(revision c6f82e543978d3fafa47bd89b2e23a3d0a86cf50)
+++ uspace/drv/bus/usb/ehci/main.c	(revision abb5d08b8dadddf815ac338a1b5357b8df0b66e6)
@@ -37,5 +37,4 @@
 #include <io/logctl.h>
 #include <usb/host/hcd.h>
-#include <usb/host/utility.h>
 
 #include "res.h"
@@ -52,5 +51,5 @@
 	.claim = disable_legacy,
 	.start = hc_start,
-	.setup_root_hub = hc_setup_virtual_root_hub,
+	.setup_root_hub = hc_setup_roothub,
 	.hc_gone = hc_gone,
 };