diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/asm-parisc/mmu_context.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-parisc/mmu_context.h')
| -rw-r--r-- | include/asm-parisc/mmu_context.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-parisc/mmu_context.h b/include/asm-parisc/mmu_context.h index bad690298f0..85856c74ad1 100644 --- a/include/asm-parisc/mmu_context.h +++ b/include/asm-parisc/mmu_context.h @@ -2,6 +2,7 @@ #define __PARISC_MMU_CONTEXT_H #include <linux/mm.h> +#include <linux/sched.h> #include <asm/atomic.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> |