Messages in this thread Patch in this message | | | Date | Sun, 4 Jun 2006 22:45:12 -0700 | From | "Randy.Dunlap" <> | Subject | Re: [PATCH] sisusb: fix build (Re: 2.6.17-rc5-mm3: sisusbvga build failure) |
| |
On Sun, 4 Jun 2006 22:11:17 -0700 Andrew Morton wrote:
> 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
Adrian might have other methods here...
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build errors caused by agressive static attributes.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> --- drivers/usb/misc/sisusbvga/sisusb.c | 17 +---------------- drivers/usb/misc/sisusbvga/sisusb.h | 2 -- 2 files changed, 1 insertion(+), 18 deletions(-)
--- linux-2617-rc5mm3.orig/drivers/usb/misc/sisusbvga/sisusb.h +++ linux-2617-rc5mm3/drivers/usb/misc/sisusbvga/sisusb.h @@ -62,11 +62,9 @@ #define INCL_SISUSB_CON 1 #endif -#ifdef INCL_SISUSB_CON #include <linux/console.h> #include <linux/vt_kern.h> #include "sisusb_struct.h" -#endif /* USB related */ --- linux-2617-rc5mm3.orig/drivers/usb/misc/sisusbvga/sisusb.c +++ linux-2617-rc5mm3/drivers/usb/misc/sisusbvga/sisusb.c @@ -1331,9 +1331,6 @@ sisusb_getreg(struct sisusb_usb_data *si } #endif -#ifndef INCL_SISUSB_CON -static -#endif int sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data) { @@ -1343,9 +1340,6 @@ sisusb_setidxreg(struct sisusb_usb_data return ret; } -#ifndef INCL_SISUSB_CON -static -#endif int sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data) { @@ -1355,9 +1349,6 @@ sisusb_getidxreg(struct sisusb_usb_data return ret; } -#ifndef INCL_SISUSB_CON -static -#endif int sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand, u8 myor) @@ -1373,7 +1364,7 @@ sisusb_setidxregandor(struct sisusb_usb_ return ret; } -static int +int sisusb_setidxregmask(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 data, u8 mask) { @@ -1387,18 +1378,12 @@ sisusb_setidxregmask(struct sisusb_usb_d return ret; } -#ifndef INCL_SISUSB_CON -static -#endif int sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor) { return(sisusb_setidxregandor(sisusb, port, index, 0xff, myor)); } -#ifndef INCL_SISUSB_CON -static -#endif int sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand) { - 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/
| |