summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-12-15 15:41:43 +1100
committerPaul Mackerras <paulus@samba.org>2006-12-20 16:37:47 +1100
commitfd38451f1512fd5230e3c5dcc66d1ca867af879b (patch)
tree595596e894bed1dfbf2fa844473e379f423ab95a /drivers/char
parentfb8b50078458ba74c3d3f7bf05f5ddc27b88f051 (diff)
downloadop-kernel-dev-fd38451f1512fd5230e3c5dcc66d1ca867af879b.zip
op-kernel-dev-fd38451f1512fd5230e3c5dcc66d1ca867af879b.tar.gz
[POWERPC] iSeries: fix viotape init
Only initialise viotape 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/char')
-rw-r--r--drivers/char/viotape.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 94d79cb..9438512 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -49,7 +49,7 @@
#include <asm/uaccess.h>
#include <asm/ioctls.h>
-
+#include <asm/firmware.h>
#include <asm/vio.h>
#include <asm/iseries/vio.h>
#include <asm/iseries/hv_lp_event.h>
@@ -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");
OpenPOWER on IntegriCloud