aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/et131x/et131x_adapter.h4
-rw-r--r--drivers/staging/et131x/et131x_config.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 8e811af6d4bf..a7402a3792d2 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -253,8 +253,6 @@ struct et131x_adapter {
253 /* Registry parameters */ 253 /* Registry parameters */
254 u8 SpeedDuplex; /* speed/duplex */ 254 u8 SpeedDuplex; /* speed/duplex */
255 eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */ 255 eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */
256 u8 RegistryWOLMatch; /* Enable WOL pattern-matching */
257 u8 RegistryWOLLink; /* Link state change is independant */
258 u8 RegistryPhyComa; /* Phy Coma mode enable/disable */ 256 u8 RegistryPhyComa; /* Phy Coma mode enable/disable */
259 257
260 u32 RegistryRxMemEnd; /* Size of internal rx memory */ 258 u32 RegistryRxMemEnd; /* Size of internal rx memory */
@@ -269,9 +267,7 @@ struct et131x_adapter {
269 u32 RegistryRxTimeInterval; 267 u32 RegistryRxTimeInterval;
270 268
271 /* Validation helpers */ 269 /* Validation helpers */
272 u8 RegistryPMWOL;
273 u8 RegistryNMIDisable; 270 u8 RegistryNMIDisable;
274 u32 RegistrySCGain;
275 u8 RegistryPhyLoopbk; /* Enable Phy loopback */ 271 u8 RegistryPhyLoopbk; /* Enable Phy loopback */
276 272
277 /* Derived from the registry: */ 273 /* Derived from the registry: */
diff --git a/drivers/staging/et131x/et131x_config.c b/drivers/staging/et131x/et131x_config.c
index 628d6ad6b88b..f8273d17ebd3 100644
--- a/drivers/staging/et131x/et131x_config.c
+++ b/drivers/staging/et131x/et131x_config.c
@@ -247,8 +247,6 @@ void et131x_config_parse(struct et131x_adapter *etdev)
247 247
248 etdev->RegistryVlanTag = PARM_VLAN_TAG_DEF; 248 etdev->RegistryVlanTag = PARM_VLAN_TAG_DEF;
249 etdev->RegistryFlowControl = PARM_FLOW_CTL_DEF; 249 etdev->RegistryFlowControl = PARM_FLOW_CTL_DEF;
250 etdev->RegistryWOLLink = PARM_WOL_LINK_DEF;
251 etdev->RegistryWOLMatch = PARM_WOL_MATCH_DEF;
252 etdev->RegistryJumboPacket = PARM_JUMBO_PKT_DEF; 250 etdev->RegistryJumboPacket = PARM_JUMBO_PKT_DEF;
253 etdev->RegistryPhyComa = PARM_PHY_COMA_DEF; 251 etdev->RegistryPhyComa = PARM_PHY_COMA_DEF;
254 etdev->RegistryRxNumBuffers = PARM_RX_NUM_BUFS_DEF; 252 etdev->RegistryRxNumBuffers = PARM_RX_NUM_BUFS_DEF;
@@ -257,8 +255,6 @@ void et131x_config_parse(struct et131x_adapter *etdev)
257 etdev->RegistryTxTimeInterval = PARM_TX_TIME_INT_DEF; 255 etdev->RegistryTxTimeInterval = PARM_TX_TIME_INT_DEF;
258 etdev->RegistryRxMemEnd = PARM_RX_MEM_END_DEF; 256 etdev->RegistryRxMemEnd = PARM_RX_MEM_END_DEF;
259 etdev->RegistryMACStat = PARM_MAC_STAT_DEF; 257 etdev->RegistryMACStat = PARM_MAC_STAT_DEF;
260 etdev->RegistrySCGain = PARM_SC_GAIN_DEF;
261 etdev->RegistryPMWOL = PARM_PM_WOL_DEF;
262 258
263 if (et131x_nmi_disable != PARM_NMI_DISABLE_DEF) 259 if (et131x_nmi_disable != PARM_NMI_DISABLE_DEF)
264 etdev->RegistryNMIDisable = et131x_nmi_disable; 260 etdev->RegistryNMIDisable = et131x_nmi_disable;