git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_mcg.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_mcg.c
b/drivers/infiniband/hw/mthca/mthca_mcg.c
index
d4c8105
..
515790a
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/
drivers/infiniband/hw/mthca/mthca_mcg.c
@@
-31,7
+31,7
@@
*/
#include <linux/string.h>
-#include <linux/
slab
.h>
+#include <linux/
gfp
.h>
#include "mthca_dev.h"
#include "mthca_cmd.h"