Re: [GIT PATCH] More USB patches for 2.6.18

[Greg KH]

On Thu, Sep 28, 2006 at 05:05:24PM -0700, Greg KH wrote:
> On Thu, Sep 28, 2006 at 04:59:51PM -0700, Andrew Morton wrote:
> > On Thu, 28 Sep 2006 16:40:23 -0700 (PDT)
> > Linus Torvalds <torvalds@xxxxxxxx> wrote:
> > 
> > > 
> > > 
> > > On Thu, 28 Sep 2006, Greg KH wrote:
> > > >
> > > > Here are some more USB bugfixes and device ids 2.6.18.  They should all
> > > > fix the reported problems in your current tree (if not, please let me
> > > > know.)
> > > > 
> > > > All of these changes have been in the -mm tree for a while.
> > > 
> > > Maybe I shouldn't have hurried you.
> > > 
> > > 	In file included from drivers/usb/host/ohci-hcd.c:140:
> > > 	drivers/usb/host/ohci-hub.c: In function 'ohci_rh_resume':
> > > 	drivers/usb/host/ohci-hub.c:184: error: invalid storage class for function 'ohci_restart'
> > > 	drivers/usb/host/ohci-hub.c:188: warning: implicit declaration of function 'ohci_restart'
> > > 	drivers/usb/host/ohci-hcd.c: At top level:
> > > 	drivers/usb/host/ohci-hcd.c:815: error: static declaration of 'ohci_restart' follows non-static declaration
> > > 	drivers/usb/host/ohci-hub.c:188: error: previous implicit declaration of 'ohci_restart' was here
> > > 	make[3]: *** [drivers/usb/host/ohci-hcd.o] Error 1
> > > 	make[2]: *** [drivers/usb/host] Error 2
> > > 	make[1]: *** [drivers/usb] Error 2
> > > 	make: *** [drivers] Error 2
> > > 
> > 
> > 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
> 
> That #ifdef shouldn't be even needed.
> 
> I'll add a patch to the git tree to fix this up, give me a few
> minutes...

Ok, Linus, if you pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git

You should have one more patch that fixes this problem.

Sorry, I think I need to upgrade to gcc4 here to catch these things...

greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/