summaryrefslogtreecommitdiff
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-12-15 15:44:04 +1100
committerPaul Mackerras <paulus@samba.org>2006-12-20 16:37:48 +1100
commit31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7 (patch)
tree99329efd8c6287f747db8c256e9d41489cff9f60 /drivers/cdrom
parent687d18abed09315a531470a0edcae977ef6a7f9e (diff)
downloadlinux-3.10-31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7.tar.gz
linux-3.10-31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7.tar.bz2
linux-3.10-31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7.zip
[POWERPC] iSeries: fix viocd init
Only initialise viocd on legacy iSeries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/viocd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 54ca931e19e..93fbf84dcc4 100644
--- a/drivers/cdrom/viocd.c
+++ b/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 */