From 0dc26145abe1adda414e9befcad262aa300ef997 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Wed, 14 Nov 2007 04:13:09 +1100
Subject: [PATCH] --- yaml --- r: 80991 b: refs/heads/master c:
 eb8f2763412893147c00e065773f46be5634f263 h: refs/heads/master i:   80989:
 2bf58c6cc60f3ec08d6c373c41792a9a138811bd   80987:
 ff1a937cb28b7293c7ed4fb87504de9c99747376   80983:
 9a309ac7da44d108b7c439068ec91fd229c9701d   80975:
 c86e5e427ca40dd13586c1f5e7fa1f084cd5f576   80959:
 ad59e4f9f383ab9a11ea7bd11f6ef2a5f0bbd668 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/sysdev/axonram.c | 5 +++--
 trunk/arch/powerpc/sysdev/pmi.c     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8f6b44986dca..83b0f122a860 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f867dc7989023935317d0dc5c04215ea0592bfc
+refs/heads/master: eb8f2763412893147c00e065773f46be5634f263
diff --git a/trunk/arch/powerpc/sysdev/axonram.c b/trunk/arch/powerpc/sysdev/axonram.c
index 5eaf3e3f4b8b..d359d6e92975 100644
--- a/trunk/arch/powerpc/sysdev/axonram.c
+++ b/trunk/arch/powerpc/sysdev/axonram.c
@@ -42,8 +42,9 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
+
 #include <asm/page.h>
 #include <asm/prom.h>
 
diff --git a/trunk/arch/powerpc/sysdev/pmi.c b/trunk/arch/powerpc/sysdev/pmi.c
index 20edd1e94eff..c858749263e0 100644
--- a/trunk/arch/powerpc/sysdev/pmi.c
+++ b/trunk/arch/powerpc/sysdev/pmi.c
@@ -28,9 +28,9 @@
 #include <linux/completion.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/io.h>
 #include <asm/pmi.h>
 #include <asm/prom.h>