diff options
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 72995777f809..b406ecfa7268 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -858,19 +858,7 @@ static struct eisa_device_id vortex_eisa_ids[] = { | |||
| 858 | }; | 858 | }; |
| 859 | MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids); | 859 | MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids); |
| 860 | 860 | ||
| 861 | static int vortex_eisa_probe(struct device *device); | 861 | static int __init vortex_eisa_probe(struct device *device) |
| 862 | static int vortex_eisa_remove(struct device *device); | ||
| 863 | |||
| 864 | static struct eisa_driver vortex_eisa_driver = { | ||
| 865 | .id_table = vortex_eisa_ids, | ||
| 866 | .driver = { | ||
| 867 | .name = "3c59x", | ||
| 868 | .probe = vortex_eisa_probe, | ||
| 869 | .remove = vortex_eisa_remove | ||
| 870 | } | ||
| 871 | }; | ||
| 872 | |||
| 873 | static int vortex_eisa_probe(struct device *device) | ||
| 874 | { | 862 | { |
| 875 | void __iomem *ioaddr; | 863 | void __iomem *ioaddr; |
| 876 | struct eisa_device *edev; | 864 | struct eisa_device *edev; |
| @@ -893,7 +881,7 @@ static int vortex_eisa_probe(struct device *device) | |||
| 893 | return 0; | 881 | return 0; |
| 894 | } | 882 | } |
| 895 | 883 | ||
| 896 | static int vortex_eisa_remove(struct device *device) | 884 | static int __devexit vortex_eisa_remove(struct device *device) |
| 897 | { | 885 | { |
| 898 | struct eisa_device *edev; | 886 | struct eisa_device *edev; |
| 899 | struct net_device *dev; | 887 | struct net_device *dev; |
| @@ -918,7 +906,17 @@ static int vortex_eisa_remove(struct device *device) | |||
| 918 | free_netdev(dev); | 906 | free_netdev(dev); |
| 919 | return 0; | 907 | return 0; |
| 920 | } | 908 | } |
| 921 | #endif | 909 | |
| 910 | static struct eisa_driver vortex_eisa_driver = { | ||
| 911 | .id_table = vortex_eisa_ids, | ||
| 912 | .driver = { | ||
| 913 | .name = "3c59x", | ||
| 914 | .probe = vortex_eisa_probe, | ||
| 915 | .remove = __devexit_p(vortex_eisa_remove) | ||
| 916 | } | ||
| 917 | }; | ||
| 918 | |||
| 919 | #endif /* CONFIG_EISA */ | ||
| 922 | 920 | ||
| 923 | /* returns count found (>= 0), or negative on error */ | 921 | /* returns count found (>= 0), or negative on error */ |
| 924 | static int __init vortex_eisa_init(void) | 922 | static int __init vortex_eisa_init(void) |
