From: Randolph Chung <randolph@tausq.org>
To: torvalds@osdl.org
Cc: netdev@oss.sgi.com
Subject: [patch] gcc-4.0 fix for acenic
Date: Wed, 10 Nov 2004 11:44:01 -0800 [thread overview]
Message-ID: <20041110194401.GL15714@tausq.org> (raw)
Small fix to compile acenic with gcc-4.0. gcc no longer accepts static
function prototypes inside a function definition. This is ugly anyway...
Signed-off-by: Randolph Chung <tausq@debian.org>
Acked-by: Jes Sorensen
Index: drivers/net/acenic.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/net/acenic.c,v
retrieving revision 1.12
diff -u -p -r1.12 acenic.c
--- linux/drivers/net/acenic.c 21 Oct 2004 18:59:05 -0000 1.12
+++ linux/drivers/net/acenic.c 10 Nov 2004 19:33:43 -0000
@@ -450,6 +450,7 @@ static char version[] __initdata =
static int ace_get_settings(struct net_device *, struct ethtool_cmd *);
static int ace_set_settings(struct net_device *, struct ethtool_cmd *);
static void ace_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
+static void ace_watchdog(struct net_device *dev);
static struct ethtool_ops ace_ethtool_ops = {
.get_settings = ace_get_settings,
@@ -485,7 +486,6 @@ static int __devinit acenic_probe_one(st
dev->vlan_rx_kill_vid = ace_vlan_rx_kill_vid;
#endif
if (1) {
- static void ace_watchdog(struct net_device *dev);
dev->tx_timeout = &ace_watchdog;
dev->watchdog_timeo = 5*HZ;
}
--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/
reply other threads:[~2004-11-10 19:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20041110194401.GL15714@tausq.org \
--to=randolph@tausq.org \
--cc=netdev@oss.sgi.com \
--cc=torvalds@osdl.org \
/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;
as well as URLs for NNTP newsgroup(s).