Skip to contentSkip to conversation

gcc-4.0 fix for acenic

PATCH New Randolph Chung 1 participant 1 message Nov 10, 2004

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Randolph Chung

author
#0 lore raw

PATCH 1/1 gcc-4.0 fix for acenic

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 <[email protected]>
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

drivers/net/acenic.c +1 -1
diff -u -p -r1.12 acenic.c
@@ -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;
 	}
Signature · 3 lines
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/