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/bnx2x/bnx2x_hsi.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/bnx2x/bnx2x_hsi.h')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_hsi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h index d9d0184b8c22..2b5940af5d1b 100644 --- a/drivers/net/bnx2x/bnx2x_hsi.h +++ b/drivers/net/bnx2x/bnx2x_hsi.h | |||
| @@ -3019,7 +3019,7 @@ struct tstorm_eth_mac_filter_config { | |||
| 3019 | 3019 | ||
| 3020 | 3020 | ||
| 3021 | /* | 3021 | /* |
| 3022 | * common flag to indicate existance of TPA. | 3022 | * common flag to indicate existence of TPA. |
| 3023 | */ | 3023 | */ |
| 3024 | struct tstorm_eth_tpa_exist { | 3024 | struct tstorm_eth_tpa_exist { |
| 3025 | #if defined(__BIG_ENDIAN) | 3025 | #if defined(__BIG_ENDIAN) |