projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'apparmor-pr-2018-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
mips
/
bcm63xx
/
prom.c
diff --git
a/arch/mips/bcm63xx/prom.c
b/arch/mips/bcm63xx/prom.c
index
7019e29
..
77a836e
100644
(file)
--- a/
arch/mips/bcm63xx/prom.c
+++ b/
arch/mips/bcm63xx/prom.c
@@
-7,7
+7,7
@@
*/
#include <linux/init.h>
-#include <linux/
bootmem
.h>
+#include <linux/
memblock
.h>
#include <linux/smp.h>
#include <asm/bootinfo.h>
#include <asm/bmips.h>