1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/misc/sgi-xp/Makefile b/drivers/misc/sgi-xp/Makefile
index b3eeff31ebf8..35ce28578075 100644
--- a/drivers/misc/sgi-xp/Makefile
+++ b/drivers/misc/sgi-xp/Makefile
@@ -3,11 +3,17 @@
 #
 
 obj-$(CONFIG_SGI_XP)            += xp.o
-xp-y                            := xp_main.o xp_uv.o
-xp-$(CONFIG_IA64)               += xp_sn2.o xp_nofault.o
+xp-y                            := xp_main.o
+xp-$(CONFIG_IA64_SGI_SN2)       += xp_sn2.o xp_nofault.o
+xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o xp_uv.o
+xp-$(CONFIG_IA64_SGI_UV)        += xp_uv.o
+xp-$(CONFIG_X86_64)             += xp_uv.o
 
 obj-$(CONFIG_SGI_XP)            += xpc.o
-xpc-y                           := xpc_main.o xpc_uv.o xpc_channel.o xpc_partition.o
-xpc-$(CONFIG_IA64)              += xpc_sn2.o
+xpc-y                           := xpc_main.o xpc_channel.o xpc_partition.o
+xpc-$(CONFIG_IA64_SGI_SN2)      += xpc_sn2.o
+xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o xpc_uv.o
+xpc-$(CONFIG_IA64_SGI_UV)       += xpc_uv.o
+xpc-$(CONFIG_X86_64)            += xpc_uv.o
 
 obj-$(CONFIG_SGI_XP)            += xpnet.o