diff options
| author | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:51:57 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:51:57 -0800 |
| commit | 3bbddbada87f30da8bcc5de7b9d06d8f2495aba5 (patch) | |
| tree | 742f35cee7d5bf52ccf6797631ec3cd06439c247 /drivers/infiniband/hw/nes/nes_hw.h | |
| parent | a835fb30954fe92a569206f9f684a755fbed395c (diff) | |
| parent | 09124e1913cf2140941f60ab4fdf8576e1e8fd8d (diff) | |
Merge branch 'nes' into for-next
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_hw.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h index 084be0ee689b..9b1e7f869d83 100644 --- a/drivers/infiniband/hw/nes/nes_hw.h +++ b/drivers/infiniband/hw/nes/nes_hw.h @@ -37,12 +37,12 @@ #define NES_PHY_TYPE_CX4 1 #define NES_PHY_TYPE_1G 2 -#define NES_PHY_TYPE_IRIS 3 #define NES_PHY_TYPE_ARGUS 4 #define NES_PHY_TYPE_PUMA_1G 5 #define NES_PHY_TYPE_PUMA_10G 6 #define NES_PHY_TYPE_GLADIUS 7 #define NES_PHY_TYPE_SFP_D 8 +#define NES_PHY_TYPE_KR 9 #define NES_MULTICAST_PF_MAX 8 |