diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 22:10:35 (GMT) |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 22:10:35 (GMT) |
commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /drivers/pci/Makefile | |
parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
download | linux-16e842a62a8ffcc2e51def6ef9fd6e0926539bc5.tar.xz |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pci/Makefile')
-rw-r--r-- | drivers/pci/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 716df015..6707df9 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -6,6 +6,9 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ pci-driver.o search.o pci-sysfs.o rom.o setup-res.o obj-$(CONFIG_PROC_FS) += proc.o +# Build PCI Express stuff if needed +obj-$(CONFIG_PCIEPORTBUS) += pcie/ + obj-$(CONFIG_HOTPLUG) += hotplug.o # Build the PCI Hotplug drivers if we were asked to @@ -40,7 +43,3 @@ endif ifeq ($(CONFIG_PCI_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif - -# Build PCI Express stuff if needed -obj-$(CONFIG_PCIEPORTBUS) += pcie/ - |