diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 21:16:27 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 21:16:27 +0100 |
commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
tree | 63429c2222a55509dc81269233bbe7a321bb86ed /drivers/net/tulip | |
parent | Merge branch 'upstream-fixes' (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
download | linux-5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859.tar.xz linux-5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 2 |
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 *); |