aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorTony Luck <aegl@agluck-lia64.sc.intel.com>2005-05-03 12:25:50 -0700
committerTony Luck <tony.luck@intel.com>2005-05-03 12:25:50 -0700
commit21223a9e78050919499d3d9039170e608eb939cc (patch)
tree8691970d17425f6e79b0567633d106ce88db0b8e /arch/ia64
parent[IA64-SGI] SGI Altix cross partition functionality (2nd (diff)
downloadlinux-dev-21223a9e78050919499d3d9039170e608eb939cc.tar.xz
linux-dev-21223a9e78050919499d3d9039170e608eb939cc.zip
[IA64] manually apply changes to arch/ia64/sn/kernel/Makefile
cg-patch couldn't apply the patch to Makefile, and my dumb script rushed on and ran cg-commit without this change. Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/sn/kernel/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 4f381fb25049..b1a4a23086b9 100644
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -4,10 +4,12 @@
# 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 += setup.o bte.o bte_error.o irq.o mca.o idle.o \
huberror.o io_init.o iomv.o klconflib.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