|
@@ -858,19 +858,7 @@ static struct eisa_device_id vortex_eisa_ids[] = {
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);
|
|
|
|
|
|
-static int vortex_eisa_probe(struct device *device);
|
|
|
-static int vortex_eisa_remove(struct device *device);
|
|
|
-
|
|
|
-static struct eisa_driver vortex_eisa_driver = {
|
|
|
- .id_table = vortex_eisa_ids,
|
|
|
- .driver = {
|
|
|
- .name = "3c59x",
|
|
|
- .probe = vortex_eisa_probe,
|
|
|
- .remove = vortex_eisa_remove
|
|
|
- }
|
|
|
-};
|
|
|
-
|
|
|
-static int vortex_eisa_probe(struct device *device)
|
|
|
+static int __init vortex_eisa_probe(struct device *device)
|
|
|
{
|
|
|
void __iomem *ioaddr;
|
|
|
struct eisa_device *edev;
|
|
@@ -893,7 +881,7 @@ static int vortex_eisa_probe(struct device *device)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int vortex_eisa_remove(struct device *device)
|
|
|
+static int __devexit vortex_eisa_remove(struct device *device)
|
|
|
{
|
|
|
struct eisa_device *edev;
|
|
|
struct net_device *dev;
|
|
@@ -918,7 +906,17 @@ static int vortex_eisa_remove(struct device *device)
|
|
|
free_netdev(dev);
|
|
|
return 0;
|
|
|
}
|
|
|
-#endif
|
|
|
+
|
|
|
+static struct eisa_driver vortex_eisa_driver = {
|
|
|
+ .id_table = vortex_eisa_ids,
|
|
|
+ .driver = {
|
|
|
+ .name = "3c59x",
|
|
|
+ .probe = vortex_eisa_probe,
|
|
|
+ .remove = __devexit_p(vortex_eisa_remove)
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
+#endif /* CONFIG_EISA */
|
|
|
|
|
|
/* returns count found (>= 0), or negative on error */
|
|
|
static int __init vortex_eisa_init(void)
|