git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
net
/
dsa
/
mv88e6xxx.c
diff --git
a/net/dsa/mv88e6xxx.c
b/net/dsa/mv88e6xxx.c
index
4e4d8b5
..
efe661a
100644
(file)
--- 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_GLOBAL
2
, 0x1d);
+ ret = REG_READ(REG_GLOBAL, 0x1d);
if ((ret & 0x8000) == 0)
return 0;
}