git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into timers/core
[pandora-kernel.git]
/
arch
/
mips
/
txx9
/
generic
/
setup.c
diff --git
a/arch/mips/txx9/generic/setup.c
b/arch/mips/txx9/generic/setup.c
index
95184a0
..
adc6929
100644
(file)
--- a/
arch/mips/txx9/generic/setup.c
+++ b/
arch/mips/txx9/generic/setup.c
@@
-23,6
+23,7
@@
#include <linux/mtd/physmap.h>
#include <linux/leds.h>
#include <linux/sysdev.h>
+#include <linux/slab.h>
#include <asm/bootinfo.h>
#include <asm/time.h>
#include <asm/reboot.h>