Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / host / fhci-hcd.c

diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 20092a27a1e8bd136a2a774440c63101b49238aa..12fd184226f248eeaec27b3222850e588410451e 100644 (file)
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -98,13 +98,13 @@ void fhci_usb_enable_interrupt(struct fhci_usb *usb)
        usb->intr_nesting_cnt--;
 }
 
-/* diable the usb interrupt */
+/* disable the usb interrupt */
 void fhci_usb_disable_interrupt(struct fhci_usb *usb)
 {
        struct fhci_hcd *fhci = usb->fhci;
 
        if (usb->intr_nesting_cnt == 0) {
-               /* diable the timer interrupt */
+               /* disable the timer interrupt */
                disable_irq_nosync(fhci->timer->irq);
 
                /* disable the usb interrupt */