diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /drivers/infiniband | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/ulp/iser/iser_memory.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c index 0606744c3f84..5e122501fd80 100644 --- a/drivers/infiniband/ulp/iser/iser_memory.c +++ b/drivers/infiniband/ulp/iser/iser_memory.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
| 38 | #include <linux/highmem.h> | ||
| 38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
| 39 | #include <asm/scatterlist.h> | 40 | #include <asm/scatterlist.h> |
| 40 | #include <linux/scatterlist.h> | 41 | #include <linux/scatterlist.h> |