diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /drivers/net/qlge/qlge.h | |
| parent | 38bfd8f5bec496e8e0db8849e01c99a33479418a (diff) | |
| parent | b5dd884e682cae6b8c037f9d11f3b623b4cf2011 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/qlge/qlge.h')
| -rw-r--r-- | drivers/net/qlge/qlge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 4b954e13c007..73c7fd2badcd 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h | |||
| @@ -97,6 +97,7 @@ enum { | |||
| 97 | 97 | ||
| 98 | /* Misc. stuff */ | 98 | /* Misc. stuff */ |
| 99 | MAILBOX_COUNT = 16, | 99 | MAILBOX_COUNT = 16, |
| 100 | MAILBOX_TIMEOUT = 5, | ||
| 100 | 101 | ||
| 101 | PROC_ADDR_RDY = (1 << 31), | 102 | PROC_ADDR_RDY = (1 << 31), |
| 102 | PROC_ADDR_R = (1 << 30), | 103 | PROC_ADDR_R = (1 << 30), |