--- zzzz-none-000/linux-2.4.17/drivers/usb/usb-ohci.h 2001-10-24 15:26:12.000000000 +0000 +++ sangam-fb-322/linux-2.4.17/drivers/usb/usb-ohci.h 2004-11-24 13:23:42.000000000 +0000 @@ -1,3 +1,6 @@ +#ifndef _USB_OHCI_H +#define _USB_OHCI_H + /* * URB OHCI HCD (Host Controller Driver) for USB. * @@ -7,6 +10,9 @@ * usb-ohci.h */ +#if defined(CONFIG_USB_PSP_HOST11) || defined(CONFIG_USB_PSP_HOST11_MODULE) +#include "psp-usb-ohci.h" +#endif static int cc_to_error[16] = { @@ -403,6 +409,7 @@ /* PCI device handle, settings, ... */ struct pci_dev *ohci_dev; + const char *slot_name; u8 pci_latency; struct pci_pool *td_cache; struct pci_pool *dev_cache; @@ -448,7 +455,7 @@ #endif #ifndef CONFIG_PCI -# error "usb-ohci currently requires PCI-based controllers" +//# error "usb-ohci currently requires PCI-based controllers" /* to support non-PCI OHCIs, you need custom bus/mem/... glue */ #endif @@ -641,3 +648,4 @@ pci_pool_free (hc->dev_cache, dev, dev->dma); } +#endif