diff --git a/[refs] b/[refs] index 2a3ebbf597f9..79544dbc96c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ee574e0c4ff86f3759987f833f06d4f0cdeb953 +refs/heads/master: ddf488baf638af36c49ed71171b8375582e5bd5f diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h index 5656472c9d3c..8c6d5f93c35d 100644 --- a/trunk/drivers/staging/et131x/et131x_adapter.h +++ b/trunk/drivers/staging/et131x/et131x_adapter.h @@ -136,7 +136,6 @@ struct ce_stats { u32 interrupt_status; }; - /* The private adapter structure */ struct et131x_adapter { struct net_device *netdev; @@ -179,11 +178,8 @@ struct et131x_adapter { /* Registry parameters */ u8 wanted_flow; /* Flow we want for 802.3x flow control */ - - u32 registry_rx_mem_end; /* Size of internal rx memory */ u32 registry_jumbo_packet; /* Max supported ethernet packet size */ - /* Derived from the registry: */ u8 ai_force_duplex; /* duplex setting */ u16 ai_force_speed; /* 'Speed', user over-ride of line speed */