diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/net/kaweth.c | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
| download | op-kernel-dev-1f419cadff55f548e7356ffebdb9e1b5a8c22275.zip op-kernel-dev-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/net/kaweth.c')
| -rw-r--r-- | drivers/usb/net/kaweth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c index c82655d..6bef1be 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/usb/net/kaweth.c @@ -469,7 +469,7 @@ static int kaweth_reset(struct kaweth_device *kaweth) 0, KAWETH_CONTROL_TIMEOUT); - udelay(10000); + mdelay(10); kaweth_dbg("kaweth_reset() returns %d.",result); |
