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/infiniband/hw/qib/qib_mad.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/infiniband/hw/qib/qib_mad.h')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_mad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_mad.h b/drivers/infiniband/hw/qib/qib_mad.h index 147aff9117d..7840ab593bc 100644 --- a/drivers/infiniband/hw/qib/qib_mad.h +++ b/drivers/infiniband/hw/qib/qib_mad.h | |||
| @@ -73,7 +73,7 @@ struct ib_mad_notice_attr { | |||
| 73 | 73 | ||
| 74 | struct { | 74 | struct { |
| 75 | __be16 reserved; | 75 | __be16 reserved; |
| 76 | __be16 lid; /* LID where change occured */ | 76 | __be16 lid; /* LID where change occurred */ |
| 77 | u8 reserved2; | 77 | u8 reserved2; |
| 78 | u8 local_changes; /* low bit - local changes */ | 78 | u8 local_changes; /* low bit - local changes */ |
| 79 | __be32 new_cap_mask; /* new capability mask */ | 79 | __be32 new_cap_mask; /* new capability mask */ |