diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/asm-um/tlb.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/asm-um/tlb.h')
| -rw-r--r-- | include/asm-um/tlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-um/tlb.h b/include/asm-um/tlb.h index 39fc475df6c9..5240fa1c5e08 100644 --- a/include/asm-um/tlb.h +++ b/include/asm-um/tlb.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef __UM_TLB_H | 1 | #ifndef __UM_TLB_H |
| 2 | #define __UM_TLB_H | 2 | #define __UM_TLB_H |
| 3 | 3 | ||
| 4 | #include <linux/pagemap.h> | ||
| 4 | #include <linux/swap.h> | 5 | #include <linux/swap.h> |
| 5 | #include <asm/percpu.h> | 6 | #include <asm/percpu.h> |
| 6 | #include <asm/pgalloc.h> | 7 | #include <asm/pgalloc.h> |