diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/infiniband/hw/mthca/mthca_catas.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_catas.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_catas.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c index 7ac52af43b99..25ebab64bc42 100644 --- a/drivers/infiniband/hw/mthca/mthca_catas.c +++ b/drivers/infiniband/hw/mthca/mthca_catas.c | |||
| @@ -32,6 +32,9 @@ | |||
| 32 | * $Id$ | 32 | * $Id$ |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/jiffies.h> | ||
| 36 | #include <linux/timer.h> | ||
| 37 | |||
| 35 | #include "mthca_dev.h" | 38 | #include "mthca_dev.h" |
| 36 | 39 | ||
| 37 | enum { | 40 | enum { |