summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-07-13 09:42:46 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-07-13 09:42:46 -0600
commitcfeeb34bc04648a61840e5376925cf9094da5ea6 (patch)
tree614dfb188b7cbfa4465509f2fdc72f11bd373e7f /drivers/pci
parent7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed (diff)
parent486ae3ea349264d84659db3a86636d7c7d94f14d (diff)
downloadlinux-cfeeb34bc04648a61840e5376925cf9094da5ea6.tar.bz2
Merge branch 'pci/greg-m68k' into next
* pci/greg-m68k: PCI: build resource code for M68K architecture
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 01c001f3b766..8d688b260e28 100644
--- 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