From 69006552a0cb781bd1d54f1c2e78032fdaf09fd2 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Dec 2006 15:44:04 +1100
Subject: [PATCH] --- yaml --- r: 44759 b: refs/heads/master c:
 31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7 h: refs/heads/master i:   44757:
 6270e75257da44859c923b649269e58863a22913   44755:
 4846e0c6aaa7eb9bd459ca77ac77a379158c2bcf   44751:
 12760cb4397375a7c7262150e792934c0a435b12 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/cdrom/viocd.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22839e2d76c7..09ea652beafa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 687d18abed09315a531470a0edcae977ef6a7f9e
+refs/heads/master: 31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7
diff --git a/trunk/drivers/cdrom/viocd.c b/trunk/drivers/cdrom/viocd.c
index 54ca931e19ea..93fbf84dcc4a 100644
--- a/trunk/drivers/cdrom/viocd.c
+++ b/trunk/drivers/cdrom/viocd.c
@@ -47,6 +47,7 @@
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/vio.h>
+#include <asm/firmware.h>
 
 #define VIOCD_DEVICE			"iseries/vcd"
 
@@ -748,6 +749,9 @@ static int __init viocd_init(void)
 	struct proc_dir_entry *e;
 	int ret = 0;
 
+	if (!firmware_has_feature(FW_FEATURE_ISERIES))
+		return -ENODEV;
+
 	if (viopath_hostLp == HvLpIndexInvalid) {
 		vio_set_hostlp();
 		/* If we don't have a host, bail out */