diff --git a/[refs] b/[refs]
index 20928cfacc1d..3376b2d36858 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb700d3653acbec8fd1f81496ce4da029e12d557
+refs/heads/master: ec86b45af464d2d3c00d1125b220d6c3b6ca93d8
diff --git a/trunk/drivers/tty/hvc/hvc_vio.c b/trunk/drivers/tty/hvc/hvc_vio.c
index fc3c3ad6c072..3a0d53d6368f 100644
--- a/trunk/drivers/tty/hvc/hvc_vio.c
+++ b/trunk/drivers/tty/hvc/hvc_vio.c
@@ -46,7 +46,6 @@
 #include <asm/hvconsole.h>
 #include <asm/vio.h>
 #include <asm/prom.h>
-#include <asm/firmware.h>
 #include <asm/hvsi.h>
 #include <asm/udbg.h>
 
@@ -322,9 +321,6 @@ static int __init 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);