diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
| commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
| tree | 63429c2222a55509dc81269233bbe7a321bb86ed /drivers/net/tulip | |
| parent | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (diff) | |
| parent | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (diff) | |
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; | |||
| 214 | /* For module input parameter */ | 214 | /* For module input parameter */ |
| 215 | static int debug; | 215 | static int debug; |
| 216 | static u32 cr6set; | 216 | static u32 cr6set; |
| 217 | static unsigned char mode = 8; | 217 | static int mode = 8; |
| 218 | 218 | ||
| 219 | /* function declaration ------------------------------------- */ | 219 | /* function declaration ------------------------------------- */ |
| 220 | static int uli526x_open(struct net_device *); | 220 | static int uli526x_open(struct net_device *); |