summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-28 06:32:05 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-28 06:32:05 +1000
commit785eb10b9f1cf1a1b9e3bb5175da04dc0ffba553 (patch)
tree3085fd015d9e3b0a504a729e049a6a9f1ca500d8
parent6fb1b304255efc5c4c93874ac8c066272e257e28 (diff)
parent6cb8e872c800be55496a56d1e1a6aafba8fa936d (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
-rw-r--r--arch/avr32/include/asm/pgalloc.h1
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 @@
#ifndef __ASM_AVR32_PGALLOC_H
#define __ASM_AVR32_PGALLOC_H
+#include <linux/mm.h>
#include <linux/quicklist.h>
#include <asm/page.h>
#include <asm/pgtable.h>