diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:03 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:06 -0500 |
commit | 8104a4775ad8a7863af0b898224b15aa708582db (patch) | |
tree | 71380e4db36e9d91e521d0a98be74981e32a6700 /arch/avr32/include/asm/pgalloc.h | |
parent | f6bbc1daac964da551130dbf01809d3fbd178b2d (diff) | |
parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/avr32/include/asm/pgalloc.h')
-rw-r--r-- | arch/avr32/include/asm/pgalloc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/pgalloc.h b/arch/avr32/include/asm/pgalloc.h index 92ecd8446ef8..bc7e8ae479ee 100644 --- a/arch/avr32/include/asm/pgalloc.h +++ b/arch/avr32/include/asm/pgalloc.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #ifndef __ASM_AVR32_PGALLOC_H | 8 | #ifndef __ASM_AVR32_PGALLOC_H |
9 | #define __ASM_AVR32_PGALLOC_H | 9 | #define __ASM_AVR32_PGALLOC_H |
10 | 10 | ||
11 | #include <linux/mm.h> | ||
11 | #include <linux/quicklist.h> | 12 | #include <linux/quicklist.h> |
12 | #include <asm/page.h> | 13 | #include <asm/page.h> |
13 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |