From: "Randy.Dunlap" <rdunlap@xenotime.net>
To: Adrian Bunk <bunk@stusta.de>
Cc: akpm@osdl.org, barryn@pobox.com, linux-kernel@vger.kernel.org,
greg@kroah.com, thomas@winischhofer.net
Subject: Re: [PATCH] sisusb: fix build (Re: 2.6.17-rc5-mm3: sisusbvga build failure)
Date: Mon, 5 Jun 2006 14:43:43 -0700 [thread overview]
Message-ID: <20060605144343.201d6cfd.rdunlap@xenotime.net> (raw)
In-Reply-To: <20060605210013.GS3955@stusta.de>
On Mon, 5 Jun 2006 23:00:14 +0200 Adrian Bunk wrote:
> Thanks for fixing this.
>
> It looks good with the exception of:
>
> > -static int
> > +int
> > sisusb_setidxregmask(struct sisusb_usb_data *sisusb, int port, u8 idx,
> > u8 data, u8 mask)
> > {
> >...
>
> This hunk doesn't seem to be required.
Agreed, verified. Andrew, this patch replaces the one from last night.
---
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 | 15 ---------------
drivers/usb/misc/sisusbvga/sisusb.h | 2 --
2 files changed, 17 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)
@@ -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)
{
prev parent reply other threads:[~2006-06-05 21:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-05 4:40 2.6.17-rc5-mm3: sisusbvga build failure Barry K. Nathan
2006-06-05 5:03 ` [PATCH] sisusb: fix build (Re: 2.6.17-rc5-mm3: sisusbvga build failure) Randy.Dunlap
2006-06-05 5:11 ` Andrew Morton
2006-06-05 5:27 ` Randy.Dunlap
2006-06-05 5:45 ` Randy.Dunlap
2006-06-05 21:00 ` Adrian Bunk
2006-06-05 21:43 ` Randy.Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060605144343.201d6cfd.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@osdl.org \
--cc=barryn@pobox.com \
--cc=bunk@stusta.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas@winischhofer.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®