Skip to content

Commit 8451a34

Browse files
LuBaolugregkh
authored andcommitted
usb: xhci: Makefile: move xhci-pci and xhci-plat-hcd after xhci-hcd
Module xhci-pci and xhci-plat-hcd depend on xhci-hcd. Module xhci-hcd should be put at a place before xhci-pci and xhci-plat-hcd. Otherwise, xhci_hcd_init() might be executed after other functions in xhci-hcd if they are all selected to be built in. Signed-off-by: Lu Baolu <[email protected]> Signed-off-by: Mathias Nyman <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5990e5d commit 8451a34

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/usb/host/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ ifneq ($(CONFIG_USB), )
2828
obj-$(CONFIG_PCI) += pci-quirks.o
2929
endif
3030

31-
obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
32-
obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o
33-
3431
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
3532
obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
3633
obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o
@@ -65,6 +62,8 @@ obj-$(CONFIG_USB_OHCI_HCD_PXA27X) += ohci-pxa27x.o
6562
obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
6663
obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
6764
obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o
65+
obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
66+
obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o
6867
obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o
6968
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
7069
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o

0 commit comments

Comments
 (0)