summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-02-03 10:45:20 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-07 08:53:11 +0100
commit99bb25793e4bb8e9b633ea001dd7312b5967385a (patch)
treef394c1a36b88781ae69260ef4d48852979cd529e /drivers/net/tulip
parentMerge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff)
downloadlinux-99bb25793e4bb8e9b633ea001dd7312b5967385a.tar.xz
linux-99bb25793e4bb8e9b633ea001dd7312b5967385a.zip
[PATCH] uli526x warning fix
drivers/net/tulip/uli526x.c: In function `__check_mode': drivers/net/tulip/uli526x.c:1693: warning: return from incompatible pointer type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r--drivers/net/tulip/uli526x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 983981666800..238e9c72cb3a 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -214,7 +214,7 @@ static u32 uli526x_cr6_user_set;
/* For module input parameter */
static int debug;
static u32 cr6set;
-static unsigned char mode = 8;
+static int mode = 8;
/* function declaration ------------------------------------- */
static int uli526x_open(struct net_device *);