Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484Ab3IJV3F (ORCPT ); Tue, 10 Sep 2013 17:29:05 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:49920 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983Ab3IJV3D (ORCPT ); Tue, 10 Sep 2013 17:29:03 -0400 From: Tom Gundersen To: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, Tom Gundersen , Alan Stern , Greg Kroah-Hartman Subject: [PATCH v2] usb: ohci/uhci - add soft dependencies on ehci_pci Date: Tue, 10 Sep 2013 23:30:14 +0200 Message-Id: <1378848614-964-1-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1496 Lines: 44 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 Cc: Alan Stern Cc: Greg Kroah-Hartman --- v2: change the dependencies to *_pci, as suggested by Alan drivers/usb/host/ohci-pci.c | 1 + drivers/usb/host/uhci-pci.c | 2 ++ 2 files changed, 3 insertions(+) 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"); -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/