mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 07:12:09 +00:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
e5a8a896f5
42 changed files with 224 additions and 103 deletions
|
@ -744,7 +744,7 @@ int netpoll_setup(struct netpoll *np)
|
|||
np->name);
|
||||
break;
|
||||
}
|
||||
cond_resched();
|
||||
msleep(1);
|
||||
}
|
||||
|
||||
/* If carrier appears to come up instantly, we don't
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue