diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /drivers/net/tokenring | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/tms380tr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index 663b8860a531..793020347e54 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
| @@ -1220,7 +1220,7 @@ void tms380tr_wait(unsigned long time) | |||
| 1220 | tmp = schedule_timeout_interruptible(tmp); | 1220 | tmp = schedule_timeout_interruptible(tmp); |
| 1221 | } while(time_after(tmp, jiffies)); | 1221 | } while(time_after(tmp, jiffies)); |
| 1222 | #else | 1222 | #else |
| 1223 | udelay(time); | 1223 | mdelay(time / 1000); |
| 1224 | #endif | 1224 | #endif |
| 1225 | } | 1225 | } |
| 1226 | 1226 | ||