summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 20:43:14 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 20:43:14 -0800
commitb1292b17dc03fcd90f3301974cea1b7c61371ba5 (patch)
treea2c76d531711a0b40c15e46b163fa94b65a2f227
parentc76d118ecc5fcac7c823fb428676860dba0fdd20 (diff)
parent29c271123dc7895a9f77d3e61e747b2a052d0a2a (diff)
downloadblackbird-op-linux-b1292b17dc03fcd90f3301974cea1b7c61371ba5.tar.gz
blackbird-op-linux-b1292b17dc03fcd90f3301974cea1b7c61371ba5.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: mlx4_core: Fix build break (missing include)
-rw-r--r--drivers/net/mlx4/alloc.c1
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 @@
#include <linux/slab.h>
#include <linux/bitmap.h>
#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
#include "mlx4.h"
OpenPOWER on IntegriCloud