Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9)
+++ uspace/Makefile	(revision 774fc852fc7b981b43a2419f9d0fee5bd8a4543e)
@@ -100,5 +100,16 @@
 	drv/test1 \
 	drv/test2 \
-	drv/test3
+	drv/test3 \
+	drv/ehci_hcd \
+	drv/ohci \
+	drv/uhci_hcd \
+	drv/uhci_rhd \
+	drv/usbflbk \
+	drv/usbhid \
+	drv/usbhub \
+	drv/usbmast \
+	drv/usbmid \
+	drv/usbmouse \
+	drv/vhc
 
 ## Networking
@@ -123,16 +134,5 @@
 		drv/ns8250 \
 		srv/hw/irc/apic \
-		srv/hw/irc/i8259 \
-		drv/ehci_hcd \
-		drv/ohci \
-		drv/uhci_hcd \
-		drv/uhci_rhd \
-		drv/usbflbk \
-		drv/usbhid \
-		drv/usbhub \
-		drv/usbmast \
-		drv/usbmid \
-		drv/usbmouse \
-		drv/vhc
+		srv/hw/irc/i8259
 endif
 
@@ -144,16 +144,5 @@
 		drv/ns8250 \
 		srv/hw/irc/apic \
-		srv/hw/irc/i8259 \
-		drv/ehci_hcd \
-		drv/ohci \
-		drv/uhci_hcd \
-		drv/uhci_rhd \
-		drv/usbflbk \
-		drv/usbhid \
-		drv/usbhub \
-		drv/usbmast \
-		drv/usbmid \
-		drv/usbmouse \
-		drv/vhc
+		srv/hw/irc/i8259
 endif