diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-26 07:51:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 07:51:35 -0400 |
| commit | de66ee979d0ea45171cc2501750e9f9f22f5a690 (patch) | |
| tree | 5ab1a5c6b596b9b786902fb380274e1e1f4ceb13 /drivers/net/via-velocity.h | |
| parent | 916f676f8dc016103f983c7ec54c18ecdbb6e349 (diff) | |
| parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/via-velocity.h')
| -rw-r--r-- | drivers/net/via-velocity.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h index d7227539484e..0f1f05f6c4f8 100644 --- a/drivers/net/via-velocity.h +++ b/drivers/net/via-velocity.h | |||
| @@ -1096,7 +1096,7 @@ struct mac_regs { | |||
| 1096 | 1096 | ||
| 1097 | volatile __le16 PatternCRC[8]; /* 0xB0 */ | 1097 | volatile __le16 PatternCRC[8]; /* 0xB0 */ |
| 1098 | volatile __le32 ByteMask[4][4]; /* 0xC0 */ | 1098 | volatile __le32 ByteMask[4][4]; /* 0xC0 */ |
| 1099 | } __packed; | 1099 | }; |
| 1100 | 1100 | ||
| 1101 | 1101 | ||
| 1102 | enum hw_mib { | 1102 | enum hw_mib { |