Merge to Fedora kernel-2.6.17-1.2187_FC5-vs2.0.2.1 patched with stable patch-2.6...

[linux-2.6.git] / arch / ia64 / sn / kernel / Makefile

diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 1e610ac..ab9c48c 100644 (file)
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -4,8 +4,18 @@
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
 #
-# Copyright (C) 1999,2001-2003 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (C) 1999,2001-2005 Silicon Graphics, Inc.  All Rights Reserved.
 #
 
-obj-y                          += probe.o setup.o bte.o irq.o mca.o idle.o sn2/
+CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
+
+obj-y                          += setup.o bte.o bte_error.o irq.o mca.o idle.o \
+                                  huberror.o io_init.o iomv.o klconflib.o pio_phys.o \
+                                  sn2/
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
+obj-$(CONFIG_SGI_TIOCX)                += tiocx.o
+obj-$(CONFIG_IA64_SGI_SN_XP)   += xp.o
+xp-y                           := xp_main.o xp_nofault.o
+obj-$(CONFIG_IA64_SGI_SN_XP)   += xpc.o
+xpc-y                          := xpc_main.o xpc_channel.o xpc_partition.o
+obj-$(CONFIG_IA64_SGI_SN_XP)   += xpnet.o