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 <[email protected]> Cc: Alan Stern <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
cluon · Sep 26, 2013 · 05c92da · 05c92da
1 parent c04ee4b
commit 05c92da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -299,3 +299,5 @@ static struct pci_driver uhci_pci_driver = {
 	},
 #endif
 };
+
+MODULE_SOFTDEP("pre: ehci_pci");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -323,3 +323,4 @@ module_exit(ohci_pci_cleanup);

		MODULE_DESCRIPTION(DRIVER_DESC);
		MODULE_LICENSE("GPL");
		MODULE_SOFTDEP("pre: ehci_pci");
-Original file line number
+Diff line change
@@ Expand Up / @@ -299,3 +299,5 @@ static struct pci_driver uhci_pci_driver = { @@
     	},
     #endif
     };
+    MODULE_SOFTDEP("pre: ehci_pci");