Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision f3365b67084d5db2c6cecdb7058c3a0a0c949b40)
+++ uspace/Makefile	(revision 53b9f2c3825e0a362ac71ad50183265aa5d20115)
@@ -143,4 +143,5 @@
 	drv/block/ata_bd \
 	drv/block/ddisk \
+	drv/block/usbmast \
 	drv/bus/adb/cuda_adb \
 	drv/bus/isa \
@@ -150,7 +151,5 @@
 	drv/bus/usb/uhci \
 	drv/bus/usb/usbflbk \
-	drv/bus/usb/usbhid \
 	drv/bus/usb/usbhub \
-	drv/bus/usb/usbmast \
 	drv/bus/usb/usbmid \
 	drv/bus/usb/vhc \
@@ -161,11 +160,9 @@
 	drv/char/ski-con \
 	drv/char/sun4v-con \
-	drv/test/test1 \
-	drv/test/test2 \
-	drv/test/test3 \
 	drv/fb/amdm37x_dispc \
 	drv/fb/kfb \
 	drv/hid/atkbd \
 	drv/hid/ps2mouse \
+	drv/hid/usbhid \
 	drv/hid/xtkbd \
 	drv/intctl/apic \
@@ -186,4 +183,7 @@
 	drv/platform/ski \
 	drv/platform/sun4v \
+	drv/test/test1 \
+	drv/test/test2 \
+	drv/test/test3 \
 	drv/time/cmos-rtc