Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 83094d067e0f..dd24fc115e48 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -52,7 +52,7 @@ __acquires(ohci->lock)
                 ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--;
                 if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) {
                         if (quirk_amdiso(ohci))
-                                quirk_amd_pll(1);
+                                usb_amd_quirk_pll_enable();
                         if (quirk_amdprefetch(ohci))
                                 sb800_prefetch(ohci, 0);
                 }
@@ -686,7 +686,7 @@ static void td_submit_urb (
                 }
                 if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) {
                         if (quirk_amdiso(ohci))
-                                quirk_amd_pll(0);
+                                usb_amd_quirk_pll_disable();
                         if (quirk_amdprefetch(ohci))
                                 sb800_prefetch(ohci, 1);
                 }