Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / arch / ia64 / sn / kernel / Makefile

diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 2d78f34..0591038 100644 (file)
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -4,19 +4,15 @@
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
 #
-# Copyright (C) 1999,2001-2005 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
 
-CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
+EXTRA_CFLAGS += -Iarch/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 \
+                                  huberror.o io_acpi_init.o io_common.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
 obj-$(CONFIG_PCI_MSI)          += msi_sn.o