From 68bcc48255fb95ae442f93615ce0bd17ef7bba5b Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Thu, 7 Jul 2011 23:38:57 +0100 Subject: [PATCH] --- yaml --- r: 260035 b: refs/heads/master c: 9c4715939a8fd4a9d90ef4855384481300f31c79 h: refs/heads/master i: 260033: 95192616246326fd6a0adc925a36426b4032ef19 260031: 32aaa9a573371e8d3e8053444b87122895b36803 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_address_map.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 57609bc20d18..0b6e707d27ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4af1c77fa618f077c23984f51aed0b0daca9fd45 +refs/heads/master: 9c4715939a8fd4a9d90ef4855384481300f31c79 diff --git a/trunk/drivers/staging/et131x/et1310_address_map.h b/trunk/drivers/staging/et131x/et1310_address_map.h index a02335ac049a..410677ee22b7 100644 --- a/trunk/drivers/staging/et131x/et1310_address_map.h +++ b/trunk/drivers/staging/et131x/et1310_address_map.h @@ -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 */ @@ -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 */ @@ -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 */ @@ -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 */