From 67204dda71f20c452b10f536e3fd5bebf6ab28d2 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Jan 2007 17:01:51 +1100
Subject: [PATCH] --- yaml --- r: 45369 b: refs/heads/master c:
 d9523aa157e9fbb93467dcd0d1bed9604153bf7f h: refs/heads/master i:   45367:
 821ca6a2df8239f076b7c38d568b6a5acc2bfe17 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/platforms/iseries/mf.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0e8f7b6a1b81..4c8d4d0ecc17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7232846b8d682a56407839e3774d03be0c7806c8
+refs/heads/master: d9523aa157e9fbb93467dcd0d1bed9604153bf7f
diff --git a/trunk/arch/powerpc/platforms/iseries/mf.c b/trunk/arch/powerpc/platforms/iseries/mf.c
index cff15ae24f6b..1ad0e4aaad1a 100644
--- a/trunk/arch/powerpc/platforms/iseries/mf.c
+++ b/trunk/arch/powerpc/platforms/iseries/mf.c
@@ -38,6 +38,7 @@
 #include <asm/uaccess.h>
 #include <asm/paca.h>
 #include <asm/abs_addr.h>
+#include <asm/firmware.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_config.h>
@@ -1235,6 +1236,9 @@ static int __init mf_proc_init(void)
 	char name[2];
 	int i;
 
+	if (!firmware_has_feature(FW_FEATURE_ISERIES))
+		return 0;
+
 	mf_proc_root = proc_mkdir("iSeries/mf", NULL);
 	if (!mf_proc_root)
 		return 1;