Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / mips / sgi-ip27 / Makefile

diff --git a/arch/mips/sgi-ip27/Makefile b/arch/mips/sgi-ip27/Makefile
index 4ba340780c351bbce9d67a7cc0dc0652b935c78b..7ce76e20beb963baa8a62bef1707bbd9c18a483d 100644 (file)
--- a/arch/mips/sgi-ip27/Makefile
+++ b/arch/mips/sgi-ip27/Makefile
@@ -2,11 +2,10 @@
 # Makefile for the IP27 specific kernel interface routines under Linux.
 #
 
-obj-y  := ip27-berr.o ip27-console.o ip27-irq.o ip27-init.o ip27-irq-glue.o \
-          ip27-klconfig.o ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-reset.o \
-          ip27-timer.o ip27-hubio.o ip27-xtalk.o
+obj-y  := ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o ip27-klnuma.o \
+          ip27-memory.o ip27-nmi.o ip27-reset.o ip27-timer.o ip27-hubio.o \
+          ip27-xtalk.o
 
-obj-$(CONFIG_KGDB)     += ip27-dbgio.o
-obj-$(CONFIG_SMP)      += ip27-smp.o
-
-EXTRA_AFLAGS := $(CFLAGS)
+obj-$(CONFIG_EARLY_PRINTK)     += ip27-console.o
+obj-$(CONFIG_KGDB)             += ip27-dbgio.o
+obj-$(CONFIG_SMP)              += ip27-smp.o