[POWERPC] iSeries: fix viotape init
From: Stephen Rothwell <hidden>
Date: 2006-12-15 04:41:31
Subsystem:
char and misc drivers, the rest · Maintainers:
Arnd Bergmann, Greg Kroah-Hartman, Linus Torvalds
Only initialise viotape on legacy iSeries. Signed-off-by: Stephen Rothwell <redacted> --- drivers/char/viotape.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 73c78bf..0c5b7d7 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");
--
1.4.4.2