diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
| commit | daefd89efc279b142bbb054577c2d706da211723 (patch) | |
| tree | 2298056232548f6f22d7bbff2662a2bbf64520de /drivers/net/ethernet/mellanox/mlx4/fw.h | |
| parent | 6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff) | |
| parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff) | |
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/fw.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h index 119e0cc9fab3..e1a5fa56bcbc 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.h +++ b/drivers/net/ethernet/mellanox/mlx4/fw.h | |||
| @@ -119,7 +119,6 @@ struct mlx4_dev_cap { | |||
| 119 | }; | 119 | }; |
| 120 | 120 | ||
| 121 | struct mlx4_func_cap { | 121 | struct mlx4_func_cap { |
| 122 | u8 function; | ||
| 123 | u8 num_ports; | 122 | u8 num_ports; |
| 124 | u8 flags; | 123 | u8 flags; |
| 125 | u32 pf_context_behaviour; | 124 | u32 pf_context_behaviour; |