diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-05 19:06:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-05 19:06:45 -0700 |
| commit | 6b1344724e10c166d9e3c17011ed879ddf302e94 (patch) | |
| tree | bbfa98b183c1249a58ad2debdb696392d8c4a029 /net/dsa | |
| parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
| parent | 1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff) | |
| download | blackbird-op-linux-6b1344724e10c166d9e3c17011ed879ddf302e94.tar.gz blackbird-op-linux-6b1344724e10c166d9e3c17011ed879ddf302e94.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/mv88e6xxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/mv88e6xxx.c b/net/dsa/mv88e6xxx.c index 4e4d8b5ad03d..efe661a9def4 100644 --- a/net/dsa/mv88e6xxx.c +++ b/net/dsa/mv88e6xxx.c @@ -418,7 +418,7 @@ static int mv88e6xxx_stats_wait(struct dsa_switch *ds) int i; for (i = 0; i < 10; i++) { - ret = REG_READ(REG_GLOBAL2, 0x1d); + ret = REG_READ(REG_GLOBAL, 0x1d); if ((ret & 0x8000) == 0) return 0; } |
