|
@@ -4958,7 +4958,7 @@ out:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static int b43_probe(struct ssb_device *dev, const struct ssb_device_id *id)
|
|
|
+static int b43_ssb_probe(struct ssb_device *dev, const struct ssb_device_id *id)
|
|
|
{
|
|
|
struct b43_wl *wl;
|
|
|
int err;
|
|
@@ -4996,7 +4996,7 @@ static int b43_probe(struct ssb_device *dev, const struct ssb_device_id *id)
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static void b43_remove(struct ssb_device *dev)
|
|
|
+static void b43_ssb_remove(struct ssb_device *dev)
|
|
|
{
|
|
|
struct b43_wl *wl = ssb_get_devtypedata(dev);
|
|
|
struct b43_wldev *wldev = ssb_get_drvdata(dev);
|
|
@@ -5039,8 +5039,8 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason)
|
|
|
static struct ssb_driver b43_ssb_driver = {
|
|
|
.name = KBUILD_MODNAME,
|
|
|
.id_table = b43_ssb_tbl,
|
|
|
- .probe = b43_probe,
|
|
|
- .remove = b43_remove,
|
|
|
+ .probe = b43_ssb_probe,
|
|
|
+ .remove = b43_ssb_remove,
|
|
|
};
|
|
|
|
|
|
static void b43_print_driverinfo(void)
|