diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/net/mlx4/profile.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/mlx4/profile.c')
| -rw-r--r-- | drivers/net/mlx4/profile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c index ca25b9dc837..5caf0115fa5 100644 --- a/drivers/net/mlx4/profile.c +++ b/drivers/net/mlx4/profile.c | |||
| @@ -32,6 +32,8 @@ | |||
| 32 | * SOFTWARE. | 32 | * SOFTWARE. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/slab.h> | ||
| 36 | |||
| 35 | #include "mlx4.h" | 37 | #include "mlx4.h" |
| 36 | #include "fw.h" | 38 | #include "fw.h" |
| 37 | 39 | ||