diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:54:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:54:02 -0400 |
| commit | acb41c0f928fdb84a1c3753ac92c534a2a0f08d2 (patch) | |
| tree | 4bf92f1c2b1f36fa68d3e77d646b04b863e1a7e4 /drivers/pci/Makefile | |
| parent | 8181780c163e7111f15619067cfa044172d532e1 (diff) | |
| parent | ef3b4f8cc20e80c767e47b848fb7512770ab80d7 (diff) | |
Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
pci/of: Consolidate pci_bus_to_OF_node()
pci/of: Consolidate pci_device_to_OF_node()
x86/devicetree: Use generic PCI <-> OF matching
microblaze/pci: Move the remains of pci_32.c to pci-common.c
microblaze/pci: Remove powermac originated cruft
pci/of: Match PCI devices to OF nodes dynamically
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 094308e41be5..631f73027608 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
| @@ -71,4 +71,6 @@ obj-$(CONFIG_PCI_STUB) += pci-stub.o | |||
| 71 | 71 | ||
| 72 | obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o | 72 | obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o |
| 73 | 73 | ||
| 74 | obj-$(CONFIG_OF) += of.o | ||
| 75 | |||
| 74 | ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG | 76 | ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG |