[PATCH] USB OHCI powerbook fix (v2.5.4)

[Paul Mackerras]

The patch below fixes a compile problem in the USB OHCI HCD driver on
powerbooks, namely that the ohci_hcd structure doesn't have an irq
member.

Paul.

diff -urN linux-2.5/drivers/usb/hcd/ohci-hcd.c pmac-2.5/drivers/usb/hcd/ohci-hcd.c
--- linux-2.5/drivers/usb/hcd/ohci-hcd.c	Sun Feb 10 20:59:48 2002
+++ pmac-2.5/drivers/usb/hcd/ohci-hcd.c	Mon Feb 11 18:47:58 2002
@@ -662,7 +662,7 @@
 		
  #ifdef CONFIG_PMAC_PBOOK
 	if (_machine == _MACH_Pmac)
-		disable_irq (ohci->irq);
+		disable_irq (hcd->pdev->irq);
  	/* else, 2.4 assumes shared irqs -- don't disable */
  #endif
 
@@ -836,7 +836,7 @@
 
  #ifdef CONFIG_PMAC_PBOOK
 		if (_machine == _MACH_Pmac)
-			enable_irq (ohci->irq);
+			enable_irq (hcd->pdev->irq);
  #endif
 		if (ohci->hcca->done_head)
 			dl_done_list (ohci, dl_reverse_done_list (ohci));