From: Stephen Rothwell Date: Fri, 15 Dec 2006 04:41:43 +0000 (+1100) Subject: [POWERPC] iSeries: fix viotape init X-Git-Tag: v2.6.20-rc2~84^2~9 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd38451f1512fd5230e3c5dcc66d1ca867af879b;p=linux-2.6 [POWERPC] iSeries: fix viotape init Only initialise viotape on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras --- diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 94d79cb8ce..9438512b17 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c @@ -49,7 +49,7 @@ #include #include - +#include #include #include #include @@ -997,6 +997,9 @@ int __init viotap_init(void) int ret; struct proc_dir_entry *e; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -ENODEV; + op_struct_list = NULL; if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) { printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");