diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2006-12-15 15:42:50 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-12-20 16:37:48 +1100 |
| commit | 687d18abed09315a531470a0edcae977ef6a7f9e (patch) | |
| tree | cc1f8721908728b500fef48c299f0286f6b8928d /drivers/net/iseries_veth.c | |
| parent | [POWERPC] iSeries: fix viotape init (diff) | |
| download | linux-dev-687d18abed09315a531470a0edcae977ef6a7f9e.tar.xz linux-dev-687d18abed09315a531470a0edcae977ef6a7f9e.zip | |
[POWERPC] iSeries: fix iseries_veth init
Only initialise iseries_veth on legacy iSeries.
Make the init and exit routines static.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/net/iseries_veth.c')
| -rw-r--r-- | drivers/net/iseries_veth.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index d6f4f185bf37..2194b567239f 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -73,7 +73,7 @@ #include <asm/abs_addr.h> #include <asm/iseries/mf.h> #include <asm/uaccess.h> - +#include <asm/firmware.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> @@ -1668,7 +1668,7 @@ static struct vio_driver veth_driver = { * Module initialization/cleanup */ -void __exit veth_module_cleanup(void) +static void __exit veth_module_cleanup(void) { int i; struct veth_lpar_connection *cnx; @@ -1697,11 +1697,14 @@ void __exit veth_module_cleanup(void) } module_exit(veth_module_cleanup); -int __init veth_module_init(void) +static int __init veth_module_init(void) { int i; int rc; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -ENODEV; + this_lp = HvLpConfig_getLpIndex_outline(); for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) { |