Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 260035
b: refs/heads/master
c: 9c47159
h: refs/heads/master
i:
  260033: 9519261
  260031: 32aaa9a
v: v3
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Jul 8, 2011
1 parent cb202d5 commit 68bcc48
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4af1c77fa618f077c23984f51aed0b0daca9fd45
refs/heads/master: 9c4715939a8fd4a9d90ef4855384481300f31c79
8 changes: 4 additions & 4 deletions trunk/drivers/staging/et131x/et1310_address_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ struct macstat_regs { /* Location: */
u32 txrx_1519_1522_gvln_frames; /* 0x6098 */

/* Rx Byte Counter */
u32 rx_bytes; /* 0x609C */
u32 rx_bytes; /* 0x609C */

/* Rx Packet Counter */
u32 rx_packets; /* 0x60A0 */
Expand All @@ -1240,7 +1240,7 @@ struct macstat_regs { /* Location: */
u32 rx_broadcast_packets; /* 0x60AC */

/* Rx Control Frame Packet Counter */
u32 rx_control_frames; /* 0x60B0 */
u32 rx_control_frames; /* 0x60B0 */

/* Rx Pause Frame Packet Counter */
u32 rx_pause_frames; /* 0x60B4 */
Expand Down Expand Up @@ -1276,7 +1276,7 @@ struct macstat_regs { /* Location: */
u32 rx_drops; /* 0x60DC */

/* Tx Byte Counter */
u32 tx_bytes; /* 0x60E0 */
u32 tx_bytes; /* 0x60E0 */

/* Tx Packet Counter */
u32 tx_packets; /* 0x60E4 */
Expand Down Expand Up @@ -1339,7 +1339,7 @@ struct macstat_regs { /* Location: */
u32 carry_reg1; /* 0x6130 */

/* Carry Register Two Register */
u32 carry_reg2; /* 0x6134 */
u32 carry_reg2; /* 0x6134 */

/* Carry Register One Mask Register */
u32 carry_reg1_mask; /* 0x6138 */
Expand Down

0 comments on commit 68bcc48

Please sign in to comment.