From 9ad75675cd4ca47dfce1bfd123f2efcd31de3689 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Jan 2007 17:05:13 +1100
Subject: [PATCH] --- yaml --- r: 45372 b: refs/heads/master c:
 e9966ff85013be0ef56d3c76f3b4d5c02488d964 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3b7504656c42..08e270616a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13d2c9bbb09e37e8a231a36b279a97861d6d5407
+refs/heads/master: e9966ff85013be0ef56d3c76f3b4d5c02488d964
diff --git a/trunk/arch/powerpc/platforms/iseries/viopath.c b/trunk/arch/powerpc/platforms/iseries/viopath.c
index 84e7ee2c086f..a6799ed34a66 100644
--- a/trunk/arch/powerpc/platforms/iseries/viopath.c
+++ b/trunk/arch/powerpc/platforms/iseries/viopath.c
@@ -42,6 +42,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/prom.h>
+#include <asm/firmware.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
@@ -183,6 +184,9 @@ static int __init vio_proc_init(void)
 {
 	struct proc_dir_entry *e;
 
+	if (!firmware_has_feature(FW_FEATURE_ISERIES))
+		return 0;
+
 	e = create_proc_entry("iSeries/config", 0, NULL);
 	if (e)
 		e->proc_fops = &proc_viopath_operations;