diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-12 15:19:16 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-12 15:19:16 -0500 |
| commit | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (patch) | |
| tree | 17852dd654c37bf86cf3d98c692eef4c6fa73a2c /drivers/net/mlx4/alloc.c | |
| parent | 7cc718d56c8297bd3a3c106ca09e8abf9814bb27 (diff) | |
| parent | 96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/mlx4/alloc.c')
| -rw-r--r-- | drivers/net/mlx4/alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c index 521dc0322ee4..75ef9d0d974d 100644 --- a/drivers/net/mlx4/alloc.c +++ b/drivers/net/mlx4/alloc.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/bitmap.h> | 35 | #include <linux/bitmap.h> |
| 36 | #include <linux/dma-mapping.h> | 36 | #include <linux/dma-mapping.h> |
| 37 | #include <linux/vmalloc.h> | ||
| 37 | 38 | ||
| 38 | #include "mlx4.h" | 39 | #include "mlx4.h" |
| 39 | 40 | ||