lkml.org 
[lkml]   [2000]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Linux 2.2.18pre12
On Sat, Sep 30, 2000 at 12:52:07AM +0100, Alan Cox wrote:
>
> o USB build bug fix (Arjan van de Ven)

It looks like the wrong USB build bug fix got included into
2.2.18pre12. Jeff Garzik and Greg KH commented that because the uhci_init
function uses initcalls, the proper fix is to remove the call to uhci_init
in drivers/usb/usb-core.c and to convert the function ohci_hcd_init to use
init calls.

Below is the patch agains 2.2.18pre12 to take out the call to uhci_init
and revert the original compile fix, Greg KH should be finishing up
ohci_hcd_init soon.

-Dave

--- linux/drivers/usb/uhci.c Sat Sep 30 01:56:24 2000
+++ linux-2.2.18pre11/drivers/usb/uhci.c Thu Sep 28 08:44:59 2000
@@ -2426,7 +2426,7 @@
return 0;
}

-int __init uhci_init(void)
+static int __init uhci_init(void)
{
int retval;
struct pci_dev *dev;
--- linux/drivers/usb/usb-uhci.c Sat Sep 30 01:56:24 2000
+++ linux-2.2.18pre11/drivers/usb/usb-uhci.c Thu Sep 28 08:44:59 2000
@@ -2822,7 +2822,7 @@
return -1;
}

-int __init uhci_init (void)
+static int __init uhci_init (void)
{
int retval = -ENODEV;
struct pci_dev *dev = NULL;
--- linux/drivers/usb/usb-core.c Sat Sep 30 01:56:24 2000
+++ linux-2.2.18pre11/drivers/usb/usb-core.c Thu Sep 28 08:47:13 2000
@@ -60,12 +60,6 @@
usb_hub_init();

#ifndef CONFIG_USB_MODULE
-#ifdef CONFIG_USB_UHCI
- uhci_init();
-#endif
-#ifdef CONFIG_USB_UHCI_ALT
- uhci_init();
-#endif
#ifdef CONFIG_USB_OHCI
ohci_hcd_init();
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 12:38    [W:0.229 / U:0.136 seconds]
©2003-2011 Jasper Spaans. Advertise on this site