From d542170b7168d6e37c6e7f3fb0635babaf8a30eb Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Wed, 22 Aug 2012 15:35:47 +0000
Subject: [PATCH] --- yaml --- r: 322273 b: refs/heads/master c:
 46c5c59e6902855b61a31be1b8e26bfffcae1e07 h: refs/heads/master i:   322271:
 41b73a17b33970f9f36033d88c8c1cf4773e9536 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/include/asm/mpic_msgr.h | 1 +
 trunk/arch/powerpc/sysdev/mpic_msgr.c      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c03f1fb7feb9..afcc97a84f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d9c00c67b4768105e8ae3d213484095c744eea8
+refs/heads/master: 46c5c59e6902855b61a31be1b8e26bfffcae1e07
diff --git a/trunk/arch/powerpc/include/asm/mpic_msgr.h b/trunk/arch/powerpc/include/asm/mpic_msgr.h
index 326d33ca55cd..d4f471fb1031 100644
--- a/trunk/arch/powerpc/include/asm/mpic_msgr.h
+++ b/trunk/arch/powerpc/include/asm/mpic_msgr.h
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <asm/smp.h>
+#include <asm/io.h>
 
 struct mpic_msgr {
 	u32 __iomem *base;
diff --git a/trunk/arch/powerpc/sysdev/mpic_msgr.c b/trunk/arch/powerpc/sysdev/mpic_msgr.c
index 483d8fa72e8b..e961f8c4a8f0 100644
--- a/trunk/arch/powerpc/sysdev/mpic_msgr.c
+++ b/trunk/arch/powerpc/sysdev/mpic_msgr.c
@@ -14,6 +14,9 @@
 #include <linux/list.h>
 #include <linux/of_platform.h>
 #include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/export.h>
+#include <linux/slab.h>
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>