| commit | cfeeb34bc04648a61840e5376925cf9094da5ea6 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Jul 13 09:42:46 2012 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Jul 13 09:42:46 2012 -0600 |
| tree | 614dfb188b7cbfa4465509f2fdc72f11bd373e7f | |
| parent | 7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed [diff] | |
| parent | 486ae3ea349264d84659db3a86636d7c7d94f14d [diff] |
Merge branch 'pci/greg-m68k' into next * pci/greg-m68k: PCI: build resource code for M68K architecture
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 01c001f..8d688b2 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile
@@ -49,6 +49,7 @@ 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