aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 1815b2644b96..5ad42e0aee25 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -624,7 +624,7 @@ static int pcnet_config(struct pcmcia_device *link)
624 624
625 ei_status.name = "NE2000"; 625 ei_status.name = "NE2000";
626 ei_status.word16 = 1; 626 ei_status.word16 = 1;
627 ei_status.reset_8390 = &pcnet_reset_8390; 627 ei_status.reset_8390 = pcnet_reset_8390;
628 628
629 if (info->flags & (IS_DL10019|IS_DL10022)) 629 if (info->flags & (IS_DL10019|IS_DL10022))
630 mii_phy_probe(dev); 630 mii_phy_probe(dev);
@@ -957,7 +957,7 @@ static int pcnet_open(struct net_device *dev)
957 info->phy_id = info->eth_phy; 957 info->phy_id = info->eth_phy;
958 info->link_status = 0x00; 958 info->link_status = 0x00;
959 init_timer(&info->watchdog); 959 init_timer(&info->watchdog);
960 info->watchdog.function = &ei_watchdog; 960 info->watchdog.function = ei_watchdog;
961 info->watchdog.data = (u_long)dev; 961 info->watchdog.data = (u_long)dev;
962 info->watchdog.expires = jiffies + HZ; 962 info->watchdog.expires = jiffies + HZ;
963 add_timer(&info->watchdog); 963 add_timer(&info->watchdog);
@@ -1341,9 +1341,9 @@ static int setup_dma_config(struct pcmcia_device *link, int start_pg,
1341 ei_status.stop_page = stop_pg; 1341 ei_status.stop_page = stop_pg;
1342 1342
1343 /* set up block i/o functions */ 1343 /* set up block i/o functions */
1344 ei_status.get_8390_hdr = &dma_get_8390_hdr; 1344 ei_status.get_8390_hdr = dma_get_8390_hdr;
1345 ei_status.block_input = &dma_block_input; 1345 ei_status.block_input = dma_block_input;
1346 ei_status.block_output = &dma_block_output; 1346 ei_status.block_output = dma_block_output;
1347 1347
1348 return 0; 1348 return 0;
1349} 1349}
@@ -1489,9 +1489,9 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg,
1489 ei_status.stop_page = start_pg + ((req.Size - offset) >> 8); 1489 ei_status.stop_page = start_pg + ((req.Size - offset) >> 8);
1490 1490
1491 /* set up block i/o functions */ 1491 /* set up block i/o functions */
1492 ei_status.get_8390_hdr = &shmem_get_8390_hdr; 1492 ei_status.get_8390_hdr = shmem_get_8390_hdr;
1493 ei_status.block_input = &shmem_block_input; 1493 ei_status.block_input = shmem_block_input;
1494 ei_status.block_output = &shmem_block_output; 1494 ei_status.block_output = shmem_block_output;
1495 1495
1496 info->flags |= USE_SHMEM; 1496 info->flags |= USE_SHMEM;
1497 return 0; 1497 return 0;