diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-27 15:32:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-27 15:32:05 -0500 |
| commit | 785eb10b9f1cf1a1b9e3bb5175da04dc0ffba553 (patch) | |
| tree | 3085fd015d9e3b0a504a729e049a6a9f1ca500d8 /arch | |
| parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
| parent | 6cb8e872c800be55496a56d1e1a6aafba8fa936d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
avr32: add missing include causing undefined pgtable_page_* references
Diffstat (limited to 'arch')
| -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> |