diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/cnic.c | 6 | ||||
-rw-r--r-- | drivers/net/cnic_if.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 44f77eb1180f..4d1515f45ba2 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <linux/ethtool.h> | 26 | #include <linux/ethtool.h> |
27 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
28 | #include <linux/module.h> | ||
29 | |||
30 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | 28 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |
31 | #define BCM_VLAN 1 | 29 | #define BCM_VLAN 1 |
32 | #endif | 30 | #endif |
@@ -2521,9 +2519,9 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev) | |||
2521 | struct cnic_dev *cdev; | 2519 | struct cnic_dev *cdev; |
2522 | struct cnic_local *cp; | 2520 | struct cnic_local *cp; |
2523 | struct cnic_eth_dev *ethdev = NULL; | 2521 | struct cnic_eth_dev *ethdev = NULL; |
2524 | struct cnic_eth_dev *(*probe)(void *) = NULL; | 2522 | struct cnic_eth_dev *(*probe)(struct net_device *) = NULL; |
2525 | 2523 | ||
2526 | probe = __symbol_get("bnx2_cnic_probe"); | 2524 | probe = symbol_get(bnx2_cnic_probe); |
2527 | if (probe) { | 2525 | if (probe) { |
2528 | ethdev = (*probe)(dev); | 2526 | ethdev = (*probe)(dev); |
2529 | symbol_put_addr(probe); | 2527 | 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); | |||
296 | 296 | ||
297 | extern int cnic_unregister_driver(int ulp_type); | 297 | extern int cnic_unregister_driver(int ulp_type); |
298 | 298 | ||
299 | extern struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev); | ||
300 | |||
299 | #endif | 301 | #endif |