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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
ps3
/
mm.c
diff --git
a/arch/powerpc/platforms/ps3/mm.c
b/arch/powerpc/platforms/ps3/mm.c
index
846eb8b
..
189a25b
100644
(file)
--- a/
arch/powerpc/platforms/ps3/mm.c
+++ b/
arch/powerpc/platforms/ps3/mm.c
@@
-23,8
+23,8
@@
#include <linux/memory_hotplug.h>
#include <linux/lmb.h>
#include <linux/memory_hotplug.h>
#include <linux/lmb.h>
+#include <asm/cell-regs.h>
#include <asm/firmware.h>
#include <asm/firmware.h>
-#include <asm/iommu.h>
#include <asm/prom.h>
#include <asm/udbg.h>
#include <asm/lv1call.h>
#include <asm/prom.h>
#include <asm/udbg.h>
#include <asm/lv1call.h>