Merge branch 'pci/greg-m68k' into next

* pci/greg-m68k: PCI: build resource code for M68K architecture
git-mirror · Jul 13, 2012 · cfeeb34 · cfeeb34
2 parents 7569c43 + 486ae3e
commit cfeeb34
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_MN10300) += setup-bus.o
 obj-$(CONFIG_MICROBLAZE) += setup-bus.o
 obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
 obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o
+obj-$(CONFIG_M68K) += setup-bus.o setup-irq.o
 
 #
 # ACPI Related PCI FW Functions