From 02dfd3fc5b4d43f1417c8b4e8df9179a5d0870ee Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 3 Sep 2010 10:22:19 +0200
Subject: [PATCH] --- yaml --- r: 215855 b: refs/heads/master c:
 26e673c3003bc8f24bdbbdcb8bc91a78556f579a h: refs/heads/master i:   215853:
 68cbdd69db048f348bc9f5dc51ac520348bce9fc   215851:
 b06a0314cd2a200c0d7ee805bd30f487106c923e   215847:
 d5646273f7c9e564646fa34c553e0e8468186e2f   215839:
 9935b60867f45b37d6988b3a7715e56a1bd080eb v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/include/asm/kvm_para.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e0052ac42ba0..4630471b56ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1e87c7ee65a20b10faf7e59dbe2cc934c32473b
+refs/heads/master: 26e673c3003bc8f24bdbbdcb8bc91a78556f579a
diff --git a/trunk/arch/powerpc/include/asm/kvm_para.h b/trunk/arch/powerpc/include/asm/kvm_para.h
index d79fd0910964..50533f9adf40 100644
--- a/trunk/arch/powerpc/include/asm/kvm_para.h
+++ b/trunk/arch/powerpc/include/asm/kvm_para.h
@@ -21,7 +21,6 @@
 #define __POWERPC_KVM_PARA_H__
 
 #include <linux/types.h>
-#include <linux/of.h>
 
 struct kvm_vcpu_arch_shared {
 	__u64 scratch1;
@@ -54,6 +53,8 @@ struct kvm_vcpu_arch_shared {
 
 #ifdef CONFIG_KVM_GUEST
 
+#include <linux/of.h>
+
 static inline int kvm_para_available(void)
 {
 	struct device_node *hyper_node;