Merge 3.12-rc3 into usb-next

[deliverable/linux.git] / drivers / usb / host / uhci-pci.c

diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index 0f228c46eedaab97c9351f784b8604d6144bb517..d89c78dc70c0c916503d7db0c9e02f865377be62 100644 (file)
--- 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");