diff --git a/[refs] b/[refs] index a4ba269427a9..f9896764aa61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb +refs/heads/master: 0a62677b26ccb31cd81fc55d14d27d8cd3560d7d diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 7667a62ac31f..ce3f25ff2737 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -226,7 +226,7 @@ enum { #define NVREG_MISC1_HD 0x02 #define NVREG_MISC1_FORCE 0x3b0f3c - NvRegMacReset = 0x3c, + NvRegMacReset = 0x34, #define NVREG_MAC_RESET_ASSERT 0x0F3 NvRegTransmitterControl = 0x084, #define NVREG_XMITCTL_START 0x01