Merge branch 'pci/greg-m68k' into next

* pci/greg-m68k: PCI: build resource code for M68K architecture

Merge branch 'pci/greg-m68k' into next
* pci/greg-m68k: PCI: build resource code for M68K architecture
cfeeb34b · Bjorn Helgaas · 7569c43e · 486ae3ea · cfeeb34b
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

drivers/pci/Makefile drivers/pci/Makefile +1 -0

未找到文件。
--- 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