Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

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

diff --git a/arch/mips/sgi-ip22/Makefile b/arch/mips/sgi-ip22/Makefile
index 6aa4c0cd169ce513eba9dcafadd98faf2f797cb6..ef1564e40c8d694962a5297eee087c602f14bbbc 100644 (file)
--- a/arch/mips/sgi-ip22/Makefile
+++ b/arch/mips/sgi-ip22/Makefile
@@ -3,9 +3,11 @@
 # under Linux.
 #
 
-obj-y  += ip22-mc.o ip22-hpc.o ip22-int.o ip22-berr.o \
-          ip22-time.o ip22-nvram.o ip22-reset.o ip22-setup.o
+obj-y  += ip22-mc.o ip22-hpc.o ip22-int.o ip22-time.o ip22-nvram.o \
+          ip22-platform.o ip22-reset.o ip22-setup.o
 
+obj-$(CONFIG_SGI_IP22) += ip22-berr.o
+obj-$(CONFIG_SGI_IP28) += ip28-berr.o
 obj-$(CONFIG_EISA)     += ip22-eisa.o
 
-EXTRA_AFLAGS := $(CFLAGS)
+# EXTRA_CFLAGS += -Werror