diff options
author | Milton Miller <miltonm@bga.com> | 2005-12-16 14:08:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-16 14:25:25 -0500 |
commit | 52f975ea21e28871a371c2d941e13d64c9f8cd66 (patch) | |
tree | dfd5c02f4eefdcd9e7af8884f6c383a4b54621e3 /drivers/pci | |
parent | dfded4ae71080b53798c7bbf4628a9b22d1e3e8b (diff) |
[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/pci')
-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 \ | |||
6 | pci-driver.o search.o pci-sysfs.o rom.o setup-res.o | 6 | pci-driver.o search.o pci-sysfs.o rom.o setup-res.o |
7 | obj-$(CONFIG_PROC_FS) += proc.o | 7 | obj-$(CONFIG_PROC_FS) += proc.o |
8 | 8 | ||
9 | # Build PCI Express stuff if needed | ||
10 | obj-$(CONFIG_PCIEPORTBUS) += pcie/ | ||
11 | |||
9 | obj-$(CONFIG_HOTPLUG) += hotplug.o | 12 | obj-$(CONFIG_HOTPLUG) += hotplug.o |
10 | 13 | ||
11 | # Build the PCI Hotplug drivers if we were asked to | 14 | # Build the PCI Hotplug drivers if we were asked to |
@@ -40,7 +43,3 @@ endif | |||
40 | ifeq ($(CONFIG_PCI_DEBUG),y) | 43 | ifeq ($(CONFIG_PCI_DEBUG),y) |
41 | EXTRA_CFLAGS += -DDEBUG | 44 | EXTRA_CFLAGS += -DDEBUG |
42 | endif | 45 | endif |
43 | |||
44 | # Build PCI Express stuff if needed | ||
45 | obj-$(CONFIG_PCIEPORTBUS) += pcie/ | ||
46 | |||