[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>

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);