diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-28 16:35:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-28 16:35:13 -0400 |
| commit | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch) | |
| tree | e912dbe14b6af76b0ebe853a9976c99616bb8a4c /drivers/net | |
| parent | 983f27d37d4fc72c252835cb2ee3103b360735a6 (diff) | |
| parent | 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b (diff) | |
Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/via-velocity.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h index d9a774b91ddc..f1b2640ebdc6 100644 --- a/drivers/net/via-velocity.h +++ b/drivers/net/via-velocity.h | |||
| @@ -307,7 +307,7 @@ enum velocity_owner { | |||
| 307 | #define TX_QUEUE_NO 4 | 307 | #define TX_QUEUE_NO 4 |
| 308 | 308 | ||
| 309 | #define MAX_HW_MIB_COUNTER 32 | 309 | #define MAX_HW_MIB_COUNTER 32 |
| 310 | #define VELOCITY_MIN_MTU (1514-14) | 310 | #define VELOCITY_MIN_MTU (64) |
| 311 | #define VELOCITY_MAX_MTU (9000) | 311 | #define VELOCITY_MAX_MTU (9000) |
| 312 | 312 | ||
| 313 | /* | 313 | /* |