diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-24 20:57:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-24 20:57:16 -0500 |
| commit | 323dbaba2cfab170c656f5d68986ff0ced5b421c (patch) | |
| tree | 99d2ef0d64df0036a4a9d2ef054b5bf20dd7fbd5 /drivers/net/via-rhine.c | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/via-rhine.c')
| -rw-r--r-- | drivers/net/via-rhine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 7c851b1e6daa..8c9d6ae2bb31 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
| @@ -1893,7 +1893,7 @@ static void rhine_shutdown (struct pci_dev *pdev) | |||
| 1893 | 1893 | ||
| 1894 | /* Make sure we use pattern 0, 1 and not 4, 5 */ | 1894 | /* Make sure we use pattern 0, 1 and not 4, 5 */ |
| 1895 | if (rp->quirks & rq6patterns) | 1895 | if (rp->quirks & rq6patterns) |
| 1896 | iowrite8(0x04, ioaddr + 0xA7); | 1896 | iowrite8(0x04, ioaddr + WOLcgClr); |
| 1897 | 1897 | ||
| 1898 | if (rp->wolopts & WAKE_MAGIC) { | 1898 | if (rp->wolopts & WAKE_MAGIC) { |
| 1899 | iowrite8(WOLmagic, ioaddr + WOLcrSet); | 1899 | iowrite8(WOLmagic, ioaddr + WOLcrSet); |