git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
hw
/
mlx4
/
cq.c
diff --git
a/drivers/infiniband/hw/mlx4/cq.c
b/drivers/infiniband/hw/mlx4/cq.c
index de5263beab4a721a8c261b8c8403996bb54e26b8..cc2ddd29ac57dc62e5f4f0d88eeb6bc64ee40c4c 100644
(file)
--- a/
drivers/infiniband/hw/mlx4/cq.c
+++ b/
drivers/infiniband/hw/mlx4/cq.c
@@
-33,6
+33,7
@@
#include <linux/mlx4/cq.h>
#include <linux/mlx4/qp.h>
+#include <linux/slab.h>
#include "mlx4_ib.h"
#include "user.h"