From 35f4a347084e98853db0afc4ca5549124071bdf5 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Sat, 13 Jun 2009 17:43:02 -0700
Subject: [PATCH] --- yaml --- r: 154034 b: refs/heads/master c:
 e2ee3616bc334ab51e68aad6905761ca97f35559 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/cnic.c    | 4 ++--
 trunk/drivers/net/cnic_if.h | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2000b602a139..beb346b0238e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cbdca23c8a4e6d007b62c9136ba0e5f86e069d0
+refs/heads/master: e2ee3616bc334ab51e68aad6905761ca97f35559
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index a9e2fd35bb41..4d1515f45ba2 100644
--- a/trunk/drivers/net/cnic.c
+++ b/trunk/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/trunk/drivers/net/cnic_if.h b/trunk/drivers/net/cnic_if.h
index 06380963a34e..d1bce27ee99e 100644
--- a/trunk/drivers/net/cnic_if.h
+++ b/trunk/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