diff -Nru a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
--- a/drivers/usb/core/hcd.h Wed Feb 11 11:42:39 2004
+++ b/drivers/usb/core/hcd.h Wed Feb 11 11:42:39 2004
@@ -76,17 +76,14 @@
unsigned saw_irq : 1;
int irq; /* irq allocated */
void *regs; /* device memory/io */
- struct device *controller; /* handle to hardware */
- /* a few non-PCI controllers exist, mostly for OHCI */
- struct pci_dev *pdev; /* pci is typical */
#ifdef CONFIG_PCI
int region; /* pci region for regs */
u32 pci_state [16]; /* for PM state save */
#endif
#define HCD_BUFFER_POOLS 4
- struct pci_pool *pool [HCD_BUFFER_POOLS];
+ struct dma_pool *pool [HCD_BUFFER_POOLS];
int state;
# define __ACTIVE 0x01
@@ -355,7 +352,7 @@
static inline int hcd_register_root (struct usb_hcd *hcd)
{
return usb_register_root_hub (
- hcd_to_bus (hcd)->root_hub, hcd->controller);
+ hcd_to_bus (hcd)->root_hub, hcd->self.controller);
}
/*-------------------------------------------------------------------------*/
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
