summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-09-10 21:30:14 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 00:20:52 (GMT)
commit05c92da0c52494caf97d58be1b05b1f95a79ce4e (patch)
treecf635b671c601c9b9345f77242a086f944cd0fd4
parentc04ee4b1136e462722567cf6e76bb35a181574a7 (diff)
downloadlinux-05c92da0c52494caf97d58be1b05b1f95a79ce4e.tar.xz
usb: ohci/uhci - add soft dependencies on ehci_pci
Support for specifying soft dependencies in the modules themselves was introduced in commit 7cb14ba. In Arch we have always been shipping a module.d(5) fragment ordering ohci/uhci after ehci. If this ordering is really necessary, it would be great to move it to the kernel and getting the correct fragment generated by depmod. Signed-off-by: Tom Gundersen <teg@jklm.no> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ohci-pci.c1
-rw-r--r--drivers/usb/host/uhci-pci.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index ec337c2..eedf97c 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -323,3 +323,4 @@ module_exit(ohci_pci_cleanup);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: ehci_pci");
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index c300bd2f7..f7bbf43 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -299,3 +299,5 @@ static struct pci_driver uhci_pci_driver = {
},
#endif
};
+
+MODULE_SOFTDEP("pre: ehci_pci");