Re: [PATCH] sisusb: fix build (Re: 2.6.17-rc5-mm3: sisusbvga build failure)

["Randy.Dunlap" <rdunlap@xenotime.net>]

On Sun, 4 Jun 2006 22:11:17 -0700 Andrew Morton wrote:

> On Sun, 4 Jun 2006 22:03:47 -0700
> "Randy.Dunlap" <rdunlap@xenotime.net> wrote:
> 
> > From: Randy Dunlap <rdunlap@xenotime.net>
> > 
> > Fix build errors caused by missing header file.
> > 
> > Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> > ---
> >  drivers/usb/misc/sisusbvga/sisusb.h |    2 +-
> >  1 files changed, 1 insertion(+), 1 deletion(-)
> > 
> > --- linux-2617-rc5mm3.orig/drivers/usb/misc/sisusbvga/sisusb.h
> > +++ linux-2617-rc5mm3/drivers/usb/misc/sisusbvga/sisusb.h
> > @@ -65,8 +65,8 @@
> >  #ifdef INCL_SISUSB_CON
> >  #include <linux/console.h>
> >  #include <linux/vt_kern.h>
> > -#include "sisusb_struct.h"
> >  #endif
> > +#include "sisusb_struct.h"
> 
> OK, but with that applied it still fails:
> 
> In file included from drivers/usb/misc/sisusbvga/sisusb.c:56:
> drivers/usb/misc/sisusbvga/sisusb_init.h:837: warning: 'struct vc_data' declared inside parameter list
> drivers/usb/misc/sisusbvga/sisusb_init.h:837: warning: its scope is only this definition or declaration, which is probably not what you want
> drivers/usb/misc/sisusbvga/sisusb.c:1339: error: static declaration of 'sisusb_setidxreg' follows non-static declaration
> drivers/usb/misc/sisusbvga/sisusb_init.h:819: error: previous declaration of 'sisusb_setidxreg' was here
> drivers/usb/misc/sisusbvga/sisusb.c:1351: error: static declaration of 'sisusb_getidxreg' follows non-static declaration
> drivers/usb/misc/sisusbvga/sisusb_init.h:821: error: previous declaration of 'sisusb_getidxreg' was here
> drivers/usb/misc/sisusbvga/sisusb.c:1364: error: static declaration of 'sisusb_setidxregandor' follows non-static declaration
> drivers/usb/misc/sisusbvga/sisusb_init.h:823: error: previous declaration of 'sisusb_setidxregandor' was here
> drivers/usb/misc/sisusbvga/sisusb.c:1395: error: static declaration of 'sisusb_setidxregor' follows non-static declaration
> drivers/usb/misc/sisusbvga/sisusb_init.h:825: error: previous declaration of 'sisusb_setidxregor' was here
> drivers/usb/misc/sisusbvga/sisusb.c:1404: error: static declaration of 'sisusb_setidxregand' follows non-static declaration
> drivers/usb/misc/sisusbvga/sisusb_init.h:827: error: previous declaration of 'sisusb_setidxregand' was here
> make[1]: *** [drivers/usb/misc/sisusbvga/sisusb.o] Error 1
> 
> Culprit is gregkh-usb-usb-sisusbvga-possible-cleanups.patch

Yes, I was just about to retract that patch.  Sorry.
I probably can't fix it tonight.

---
~Randy