aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/madgemc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tokenring/madgemc.c')
-rw-r--r--drivers/net/tokenring/madgemc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 193308118f95..456f8bff40be 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -142,7 +142,7 @@ static void madgemc_sifwritew(struct net_device *dev, unsigned short val, unsign
142 return; 142 return;
143} 143}
144 144
145 145static struct net_device_ops madgemc_netdev_ops __read_mostly;
146 146
147static int __devinit madgemc_probe(struct device *device) 147static int __devinit madgemc_probe(struct device *device)
148{ 148{
@@ -168,7 +168,7 @@ static int __devinit madgemc_probe(struct device *device)
168 goto getout; 168 goto getout;
169 } 169 }
170 170
171 dev->dma = 0; 171 dev->netdev_ops = &madgemc_netdev_ops;
172 172
173 card = kmalloc(sizeof(struct card_info), GFP_KERNEL); 173 card = kmalloc(sizeof(struct card_info), GFP_KERNEL);
174 if (card==NULL) { 174 if (card==NULL) {
@@ -348,9 +348,6 @@ static int __devinit madgemc_probe(struct device *device)
348 348
349 memcpy(tp->ProductID, "Madge MCA 16/4 ", PROD_ID_SIZE + 1); 349 memcpy(tp->ProductID, "Madge MCA 16/4 ", PROD_ID_SIZE + 1);
350 350
351 dev->open = madgemc_open;
352 dev->stop = madgemc_close;
353
354 tp->tmspriv = card; 351 tp->tmspriv = card;
355 dev_set_drvdata(device, dev); 352 dev_set_drvdata(device, dev);
356 353
@@ -758,6 +755,10 @@ static struct mca_driver madgemc_driver = {
758 755
759static int __init madgemc_init (void) 756static int __init madgemc_init (void)
760{ 757{
758 madgemc_netdev_ops = tms380tr_netdev_ops;
759 madgemc_netdev_ops.ndo_open = madgemc_open;
760 madgemc_netdev_ops.ndo_stop = madgemc_close;
761
761 return mca_register_driver (&madgemc_driver); 762 return mca_register_driver (&madgemc_driver);
762} 763}
763 764