Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 0caa075ea82d03f424199300f84ace6747f5bd02)
+++ uspace/Makefile	(revision e1fc679a4476fa9e58fe39d81cd6aac27992912a)
@@ -176,16 +176,5 @@
 #
 
-ifeq ($(UARCH),amd64)
-	DIRS += \
-		drv/infrastructure/rootpc \
-		drv/bus/pci/pciintel \
-		drv/bus/isa \
-		drv/char/ns8250 \
-		drv/time/cmos-rtc \
-		srv/hw/irc/apic \
-		srv/hw/irc/i8259
-endif
-
-ifeq ($(UARCH),ia32)
+ifeq ($(UARCH), $(filter $(UARCH),amd64 ia32 ia64))
 	DIRS += \
 		drv/infrastructure/rootpc \