diff options
| author |   Michael Chan <mchan@broadcom.com> | 2009-06-13 17:43:02 -0700 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-21 11:00:33 -0500 |
| commit | e2ee3616bc334ab51e68aad6905761ca97f35559 (patch) | |
| tree | 51b236991cb89d3f7bc6ab6841c5c3bf69d5bdfc /drivers | |
| parent | Revert "[SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’" (diff) | |
| download | linux-dev-e2ee3616bc334ab51e68aad6905761ca97f35559.tar.xz linux-dev-e2ee3616bc334ab51e68aad6905761ca97f35559.zip | |
cnic: Fix __symbol_get() build error.
Ingo molnar <mingo@elte.hu> reported the error
drivers/net/cnic.c:2520: error: implicit declaration of function ‘__symbol_get’
when CONFIG_MODULES is not defined. Fix by using symbol_get() instead.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/cnic.c | 4 | ||||
| -rw-r--r-- | drivers/net/cnic_if.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index a9e2fd35bb41..4d1515f45ba2 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -2519,9 +2519,9 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev) struct cnic_dev *cdev; struct cnic_local *cp; struct cnic_eth_dev *ethdev = NULL; - struct cnic_eth_dev *(*probe)(void *) = NULL; + struct cnic_eth_dev *(*probe)(struct net_device *) = NULL; - probe = __symbol_get("bnx2_cnic_probe"); + probe = symbol_get(bnx2_cnic_probe); if (probe) { ethdev = (*probe)(dev); symbol_put_addr(probe); diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h index 06380963a34e..d1bce27ee99e 100644 --- a/drivers/net/cnic_if.h +++ b/drivers/net/cnic_if.h @@ -296,4 +296,6 @@ extern int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops); extern int cnic_unregister_driver(int ulp_type); +extern struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev); + #endif |