summaryrefslogtreecommitdiff
path: root/drivers/char/hvc_vio.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-09-25 07:30:51 +0400
committerStephen Rothwell <sfr@canb.auug.org.au>2006-09-25 07:30:51 +0400
commitde0138da0f8cf406c096daec7494a5cbebce2e5c (patch)
tree337c9cf8b3ada88ac6bf9aecfa36c8ad759ea4bd /drivers/char/hvc_vio.c
parentef26a46f8c501f6888cc78bcc4a2dc1efea1e733 (diff)
downloadlinux-de0138da0f8cf406c096daec7494a5cbebce2e5c.tar.xz
[POWERPC] The two vio HVC backends clash
Make sure only one of them actually registers as a driver. Also, remove cast from get_property(). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers/char/hvc_vio.c')
-rw-r--r--drivers/char/hvc_vio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index cc95941148fb..f9c00844d2bf 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -35,6 +35,7 @@
#include <asm/hvconsole.h>
#include <asm/vio.h>
#include <asm/prom.h>
+#include <asm/firmware.h>
#include "hvc_console.h"
@@ -120,6 +121,9 @@ static int hvc_vio_init(void)
{
int rc;
+ if (firmware_has_feature(FW_FEATURE_ISERIES))
+ return -EIO;
+
/* Register as a vio device to receive callbacks */
rc = vio_register_driver(&hvc_vio_driver);