diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 08:26:41 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 08:26:41 +0100 |
commit | d60cf53a30956e47919788b2ef49287786a959c9 (patch) | |
tree | cb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /arch/s390/include/asm/tlb.h | |
parent | sh: sh7750: Fix incompatible pointer type (diff) | |
parent | sh: Change __nosave_XXX symbols to long (diff) | |
download | linux-d60cf53a30956e47919788b2ef49287786a959c9.tar.xz linux-d60cf53a30956e47919788b2ef49287786a959c9.zip |
Merge branch 'sh/st-integration' into sh/urgent
Diffstat (limited to 'arch/s390/include/asm/tlb.h')
-rw-r--r-- | arch/s390/include/asm/tlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index f1f644f2240a..9074a54c4d10 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -22,6 +22,7 @@ */ #include <linux/mm.h> +#include <linux/pagemap.h> #include <linux/swap.h> #include <asm/processor.h> #include <asm/pgalloc.h> |