diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-15 14:16:54 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-20 20:16:11 -0400 |
commit | ec86b45af464d2d3c00d1125b220d6c3b6ca93d8 (patch) | |
tree | 11222c1729ff715c4032c37fb32d7eaf4fee5abb /drivers/tty/hvc/hvc_vio.c | |
parent | fb700d3653acbec8fd1f81496ce4da029e12d557 (diff) |
tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable
so remove the code that tests for it.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/tty/hvc/hvc_vio.c')
-rw-r--r-- | drivers/tty/hvc/hvc_vio.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index fc3c3ad6c072..3a0d53d6368f 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <asm/hvconsole.h> | 46 | #include <asm/hvconsole.h> |
47 | #include <asm/vio.h> | 47 | #include <asm/vio.h> |
48 | #include <asm/prom.h> | 48 | #include <asm/prom.h> |
49 | #include <asm/firmware.h> | ||
50 | #include <asm/hvsi.h> | 49 | #include <asm/hvsi.h> |
51 | #include <asm/udbg.h> | 50 | #include <asm/udbg.h> |
52 | 51 | ||
@@ -322,9 +321,6 @@ static int __init hvc_vio_init(void) | |||
322 | { | 321 | { |
323 | int rc; | 322 | int rc; |
324 | 323 | ||
325 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | ||
326 | return -EIO; | ||
327 | |||
328 | /* Register as a vio device to receive callbacks */ | 324 | /* Register as a vio device to receive callbacks */ |
329 | rc = vio_register_driver(&hvc_vio_driver); | 325 | rc = vio_register_driver(&hvc_vio_driver); |
330 | 326 | ||