diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /drivers/infiniband/hw/mthca | |
parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/infiniband/hw/mthca')
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_memfree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index 986f2180404b..637b30e35592 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c | |||
@@ -32,10 +32,11 @@ | |||
32 | * $Id$ | 32 | * $Id$ |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/mm.h> | ||
36 | |||
35 | #include "mthca_memfree.h" | 37 | #include "mthca_memfree.h" |
36 | #include "mthca_dev.h" | 38 | #include "mthca_dev.h" |
37 | #include "mthca_cmd.h" | 39 | #include "mthca_cmd.h" |
38 | #include <linux/mm.h> | ||
39 | 40 | ||
40 | /* | 41 | /* |
41 | * We allocate in as big chunks as we can, up to a maximum of 256 KB | 42 | * We allocate in as big chunks as we can, up to a maximum of 256 KB |