diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-06 14:27:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-06 14:27:39 -0700 |
| commit | ba9b0c11285bcdaa3243c4123e924094b626c740 (patch) | |
| tree | e14fcd2d2cd791ec3ada3700e5bc10863bf8abec /arch/mips/kernel/head.S | |
| parent | 11f9b020fa921bb33fff65b947f6422fe15f4414 (diff) | |
| parent | fd3d2764ee5aad862e51c21b8239561acdea8c2f (diff) | |
| download | blackbird-op-linux-ba9b0c11285bcdaa3243c4123e924094b626c740.tar.gz blackbird-op-linux-ba9b0c11285bcdaa3243c4123e924094b626c740.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y
[MIPS] Fix CMP Kconfig configuration and mark as broken.
Diffstat (limited to 'arch/mips/kernel/head.S')
| -rw-r--r-- | arch/mips/kernel/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index 361364501d34..492a0a8d70fb 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -22,6 +22,7 @@ #include <asm/irqflags.h> #include <asm/regdef.h> #include <asm/page.h> +#include <asm/pgtable-bits.h> #include <asm/mipsregs.h> #include <asm/stackframe.h> |
