Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index c35ee25e5578bd0f3c4426eba2d82b6c5732c18e..9565b2104dcd1dc5fc505997766afcebf9944f97 100644 (file)
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -4,6 +4,6 @@
 
 obj-y   := irq.o reset.o setup.o buttons.o
 
+obj-$(CONFIG_PCI)              += pci.o
 obj-$(CONFIG_EARLY_PRINTK)     += console.o
-
-EXTRA_AFLAGS := $(CFLAGS)
+obj-$(CONFIG_MTD_PHYSMAP)      += mtd.o