Merge branch 'pci/greg-m68k' into next

* pci/greg-m68k:
  PCI: build resource code for M68K architecture
This commit is contained in:
Bjorn Helgaas 2012-07-13 09:42:46 -06:00
commit cfeeb34bc0
1 changed files with 1 additions and 0 deletions

View File

@ -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