]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
[IA64] manually apply changes to arch/ia64/sn/kernel/Makefile
authorTony Luck <aegl@agluck-lia64.sc.intel.com>
Tue, 3 May 2005 19:25:50 +0000 (12:25 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 3 May 2005 19:25:50 +0000 (12:25 -0700)
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>
arch/ia64/sn/kernel/Makefile

index 4f381fb25049b6b87c9e4bcab0f9dc61224e4711..b1a4a23086b94bc175012a3a5c0b9ec7af05a776 100644 (file)
@@ -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