On Tuesday 12 December 2006 1:32 pm, Benjamin Herrenschmidt wrote: > > > > -static inline unsigned int ohci_readl (const struct ohci_hcd *ohci, > > > - __hc32 __iomem * regs) > > > +static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci, > > > + __hc32 __iomem * regs) > > > > Hmm, didn't Jeff Garzik queue a patch to change how some of this readl() > > magic works? Check Greg's patch queue; there may be a conflict. > > All I could find from Jeff is a patch that inlines a function in ohci.h, > not directly related and doesn't conflict with mine. I asked him and he > doesn't know about anything else :-) > > Now, I'm a bit at a loss vs. what's in greg's queue, it seems there are > other OHCI/EHCI patches in there and I don't know for sure what was > applied upstream and what not so I hope my stuff will apply properly > as it's all 2.6.20 material (well, I hope...)
IMO most of the other EHCI stuff (periodic scheduler updates) are not ready to go upstream ... that is, the usb-ehci-hcd-*.patch stuff. ... but most of the rest ought to go be merged. - Dave > > I'll send a new serie after I had a chance to test on x86. > > Ben. > > ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ linux-usb-devel@lists.sourceforge.net To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
