diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /drivers/pci/Makefile | |
parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) |
Merge branch 'master'
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 716df015f8d0..6707df968934 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/ - |