diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-10-04 09:02:27 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-04 09:02:27 +0400 |
| commit | c730f5b621afa33e9f4939da9078669162ebff4e (patch) | |
| tree | ac78a2cea0fbf365ef659c26ab192e263debb544 /drivers/char/hvc_iseries.c | |
| parent | 0a730ae59960165ae50de3284fb50316d1755d98 (diff) | |
| parent | 80a544cebca5f28397020332e21e04d639a18943 (diff) | |
| download | linux-c730f5b621afa33e9f4939da9078669162ebff4e.tar.xz | |
Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work
Diffstat (limited to 'drivers/char/hvc_iseries.c')
| -rw-r--r-- | drivers/char/hvc_iseries.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index 8b6f197e5f8c..f144a947bd17 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c @@ -29,6 +29,7 @@ #include <asm/hvconsole.h> #include <asm/vio.h> #include <asm/prom.h> +#include <asm/firmware.h> #include <asm/iseries/vio.h> #include <asm/iseries/hv_call.h> #include <asm/iseries/hv_lp_config.h> @@ -488,6 +489,9 @@ static int hvc_vio_init(void) atomic_t wait_flag; int rc; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -EIO; + /* +2 for fudge */ rc = viopath_open(HvLpConfig_getPrimaryLpIndex(), viomajorsubtype_chario, VIOCHAR_WINDOW + 2); @@ -562,7 +566,7 @@ static int hvc_find_vtys(void) for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL; vty = of_find_node_by_name(vty, "vty")) { - uint32_t *vtermno; + const uint32_t *vtermno; /* We have statically defined space for only a certain number * of console adapters. @@ -571,7 +575,7 @@ static int hvc_find_vtys(void) (num_found >= VTTY_PORTS)) break; - vtermno = (uint32_t *)get_property(vty, "reg", NULL); + vtermno = get_property(vty, "reg", NULL); if (!vtermno) continue; |