From 4b96c9120e78f213ddab20def2efd61cc12f78b1 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 27 Aug 2009 10:59:47 +0100 Subject: [PATCH] --- yaml --- r: 162506 b: refs/heads/master c: c3b4a7a92e98a51b3dd253ec6fd825ccf0dd17f7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_adapter.h | 4 ---- trunk/drivers/staging/et131x/et131x_config.c | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 17f6096c4b77..29bead599015 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bc9da3ed44c7abee310b3c4761845cb0e9bae60 +refs/heads/master: c3b4a7a92e98a51b3dd253ec6fd825ccf0dd17f7 diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h index 8e811af6d4bf..a7402a3792d2 100644 --- a/trunk/drivers/staging/et131x/et131x_adapter.h +++ b/trunk/drivers/staging/et131x/et131x_adapter.h @@ -253,8 +253,6 @@ struct et131x_adapter { /* Registry parameters */ u8 SpeedDuplex; /* speed/duplex */ eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */ - u8 RegistryWOLMatch; /* Enable WOL pattern-matching */ - u8 RegistryWOLLink; /* Link state change is independant */ u8 RegistryPhyComa; /* Phy Coma mode enable/disable */ u32 RegistryRxMemEnd; /* Size of internal rx memory */ @@ -269,9 +267,7 @@ struct et131x_adapter { u32 RegistryRxTimeInterval; /* Validation helpers */ - u8 RegistryPMWOL; u8 RegistryNMIDisable; - u32 RegistrySCGain; u8 RegistryPhyLoopbk; /* Enable Phy loopback */ /* Derived from the registry: */ diff --git a/trunk/drivers/staging/et131x/et131x_config.c b/trunk/drivers/staging/et131x/et131x_config.c index 628d6ad6b88b..f8273d17ebd3 100644 --- a/trunk/drivers/staging/et131x/et131x_config.c +++ b/trunk/drivers/staging/et131x/et131x_config.c @@ -247,8 +247,6 @@ void et131x_config_parse(struct et131x_adapter *etdev) etdev->RegistryVlanTag = PARM_VLAN_TAG_DEF; etdev->RegistryFlowControl = PARM_FLOW_CTL_DEF; - etdev->RegistryWOLLink = PARM_WOL_LINK_DEF; - etdev->RegistryWOLMatch = PARM_WOL_MATCH_DEF; etdev->RegistryJumboPacket = PARM_JUMBO_PKT_DEF; etdev->RegistryPhyComa = PARM_PHY_COMA_DEF; etdev->RegistryRxNumBuffers = PARM_RX_NUM_BUFS_DEF; @@ -257,8 +255,6 @@ void et131x_config_parse(struct et131x_adapter *etdev) etdev->RegistryTxTimeInterval = PARM_TX_TIME_INT_DEF; etdev->RegistryRxMemEnd = PARM_RX_MEM_END_DEF; etdev->RegistryMACStat = PARM_MAC_STAT_DEF; - etdev->RegistrySCGain = PARM_SC_GAIN_DEF; - etdev->RegistryPMWOL = PARM_PM_WOL_DEF; if (et131x_nmi_disable != PARM_NMI_DISABLE_DEF) etdev->RegistryNMIDisable = et131x_nmi_disable;