diff options
| author | Milton Miller <miltonm@bga.com> | 2005-12-16 20:08:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-16 20:25:25 +0100 |
| commit | 52f975ea21e28871a371c2d941e13d64c9f8cd66 (patch) | |
| tree | dfd5c02f4eefdcd9e7af8884f6c383a4b54621e3 /drivers | |
| parent | [PATCH] i2c: Fix i2c-mv64xxx compilation error (diff) | |
| download | linux-52f975ea21e28871a371c2d941e13d64c9f8cd66.tar.xz linux-52f975ea21e28871a371c2d941e13d64c9f8cd66.zip | |
[PATCH] PCI express must be initialized before PCI hotplug
PCI express hotplug uses the pcieportbus driver so pcie must be
initialized before hotplug/. This patch changes the link order.
Signed-Off-By: Milton Miller <miltonm@bga.com>
Acked-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -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/ - |