Messages in this thread | | | Subject | Re: [GIT PATCH] More USB patches for 2.6.18 | Date | Thu, 28 Sep 2006 20:51:54 -0400 | From | "Horst H. von Brand" <> |
| |
Andrew Morton <akpm@osdl.org> wrote:
[...]
> That's the "some gccs dont like static function decls in that scope" thing. > > I fixed it (unpleasantly) like this: > > > diff -puN drivers/usb/host/ohci-hub.c~ohci-add-auto-stop-support-hack-hack drivers/usb/host/ohci-hub.c > --- a/drivers/usb/host/ohci-hub.c~ohci-add-auto-stop-support-hack-hack > +++ a/drivers/usb/host/ohci-hub.c > @@ -132,6 +132,10 @@ static inline struct ed *find_head (stru > return ed; > } > > +#ifdef CONFIG_PM > +static int ohci_restart(struct ohci_hcd *ohci); > +#endif > +
The #ifdef is unneeded here.
> /* caller has locked the root hub */ > static int ohci_rh_resume (struct ohci_hcd *ohci) > __releases(ohci->lock) > @@ -181,8 +185,6 @@ __acquires(ohci->lock) > #ifdef CONFIG_PM > if (status == -EBUSY) { > if (!autostopped) { > - static int ohci_restart (struct ohci_hcd *ohci); > - > spin_unlock_irq (&ohci->lock); > (void) ohci_init (ohci); > status = ohci_restart (ohci); > _ > > - -- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 2654431 Universidad Tecnica Federico Santa Maria +56 32 2654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 2797513 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |