git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
8260_io
/
fcc_enet.c
diff --git
a/arch/ppc/8260_io/fcc_enet.c
b/arch/ppc/8260_io/fcc_enet.c
index
2086c6a
..
4edeede
100644
(file)
--- a/
arch/ppc/8260_io/fcc_enet.c
+++ b/
arch/ppc/8260_io/fcc_enet.c
@@
-1309,8
+1309,7
@@
static void mii_dm9161_wait(uint mii_reg, struct net_device *dev)
/* Davicom takes a bit to come up after a reset,
* so wait here for a bit */
/* Davicom takes a bit to come up after a reset,
* so wait here for a bit */
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(timeout);
+ schedule_timeout_uninterruptible(timeout);
}
static phy_info_t phy_info_dm9161 = {
}
static phy_info_t phy_info_dm9161 = {