Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f975ea authored by Milton Miller's avatar Milton Miller Committed by Linus Torvalds
Browse files

[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: default avatarMilton Miller <miltonm@bga.com>
Acked-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dfded4ae

drivers/pci/Makefile

+3 −4
Original line number Original line Diff line number Diff line
@@ -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

			pci-driver.o search.o pci-sysfs.o rom.o setup-res.o

obj-$(CONFIG_PROC_FS) += proc.o

obj-$(CONFIG_PROC_FS) += proc.o





# Build PCI Express stuff if needed

obj-$(CONFIG_PCIEPORTBUS) += pcie/



obj-$(CONFIG_HOTPLUG) += hotplug.o

obj-$(CONFIG_HOTPLUG) += hotplug.o





# Build the PCI Hotplug drivers if we were asked to

# Build the PCI Hotplug drivers if we were asked to
@@ -40,7 +43,3 @@ endif 
ifeq ($(CONFIG_PCI_DEBUG),y)

ifeq ($(CONFIG_PCI_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

EXTRA_CFLAGS += -DDEBUG

endif
 
endif
 


# Build PCI Express stuff if needed

obj-$(CONFIG_PCIEPORTBUS) += pcie/