diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-20 03:59:41 -0500 |
|---|---|---|
| committer | Steven Whitehouse <steve@chygwyn.com> | 2006-01-20 03:59:41 -0500 |
| commit | 044399b2cb6ad2d7f63cfca945268853d7443a4d (patch) | |
| tree | 5f96eb307b0389ac0b919a4744a40862b615e9da /drivers/net/e1000/e1000_osdep.h | |
| parent | 901359256b2666f52a3a7d3f31927677e91b3a2a (diff) | |
| parent | 18a4144028f056b77d6576d4eb284246e9c7ea97 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/e1000/e1000_osdep.h')
| -rw-r--r-- | drivers/net/e1000/e1000_osdep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h index aac64de6143..9790db974dc 100644 --- a/drivers/net/e1000/e1000_osdep.h +++ b/drivers/net/e1000/e1000_osdep.h | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | BUG(); \ | 47 | BUG(); \ |
| 48 | } else { \ | 48 | } else { \ |
| 49 | msleep(x); \ | 49 | msleep(x); \ |
| 50 | } } while(0) | 50 | } } while (0) |
| 51 | 51 | ||
| 52 | /* Some workarounds require millisecond delays and are run during interrupt | 52 | /* Some workarounds require millisecond delays and are run during interrupt |
| 53 | * context. Most notably, when establishing link, the phy may need tweaking | 53 | * context. Most notably, when establishing link, the phy may need tweaking |