diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/s2io.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/s2io.h')
| -rw-r--r-- | drivers/net/s2io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 6b5c0231225c..628fd278866a 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
| @@ -376,7 +376,7 @@ static const u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7}; | |||
| 376 | /* Maintains Per FIFO related information. */ | 376 | /* Maintains Per FIFO related information. */ |
| 377 | struct tx_fifo_config { | 377 | struct tx_fifo_config { |
| 378 | #define MAX_AVAILABLE_TXDS 8192 | 378 | #define MAX_AVAILABLE_TXDS 8192 |
| 379 | u32 fifo_len; /* specifies len of FIFO upto 8192, ie no of TxDLs */ | 379 | u32 fifo_len; /* specifies len of FIFO up to 8192, ie no of TxDLs */ |
| 380 | /* Priority definition */ | 380 | /* Priority definition */ |
| 381 | #define TX_FIFO_PRI_0 0 /*Highest */ | 381 | #define TX_FIFO_PRI_0 0 /*Highest */ |
| 382 | #define TX_FIFO_PRI_1 1 | 382 | #define TX_FIFO_PRI_1 1 |