diff options
Diffstat (limited to 'drivers/net/oaknet.c')
-rw-r--r-- | drivers/net/oaknet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/oaknet.c b/drivers/net/oaknet.c index d0f686d6eaaa..702e3e95612a 100644 --- a/drivers/net/oaknet.c +++ b/drivers/net/oaknet.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * on-board the IBM PowerPC "Oak" evaluation board. Adapted from the | 9 | * on-board the IBM PowerPC "Oak" evaluation board. Adapted from the |
10 | * various other 8390 drivers written by Donald Becker and Paul Gortmaker. | 10 | * various other 8390 drivers written by Donald Becker and Paul Gortmaker. |
11 | * | 11 | * |
12 | * Additional inspiration from the "tcd8390.c" driver from TiVo, Inc. | 12 | * Additional inspiration from the "tcd8390.c" driver from TiVo, Inc. |
13 | * and "enetLib.c" from IBM. | 13 | * and "enetLib.c" from IBM. |
14 | * | 14 | * |
15 | */ | 15 | */ |
@@ -98,7 +98,7 @@ static int __init oaknet_init(void) | |||
98 | int ret = -ENOMEM; | 98 | int ret = -ENOMEM; |
99 | struct net_device *dev; | 99 | struct net_device *dev; |
100 | #if 0 | 100 | #if 0 |
101 | unsigned long ioaddr = OAKNET_IO_BASE; | 101 | unsigned long ioaddr = OAKNET_IO_BASE; |
102 | #else | 102 | #else |
103 | unsigned long ioaddr = ioremap(OAKNET_IO_BASE, OAKNET_IO_SIZE); | 103 | unsigned long ioaddr = ioremap(OAKNET_IO_BASE, OAKNET_IO_SIZE); |
104 | #endif | 104 | #endif |
@@ -201,7 +201,7 @@ static int __init oaknet_init(void) | |||
201 | ret = register_netdev(dev); | 201 | ret = register_netdev(dev); |
202 | if (ret) | 202 | if (ret) |
203 | goto out_irq; | 203 | goto out_irq; |
204 | 204 | ||
205 | oaknet_devs = dev; | 205 | oaknet_devs = dev; |
206 | return 0; | 206 | return 0; |
207 | 207 | ||
@@ -447,8 +447,8 @@ oaknet_block_input(struct net_device *dev, int count, struct sk_buff *skb, | |||
447 | * Input(s): | 447 | * Input(s): |
448 | * *dev - Pointer to the device structure for this driver. | 448 | * *dev - Pointer to the device structure for this driver. |
449 | * count - Number of bytes to be transferred. | 449 | * count - Number of bytes to be transferred. |
450 | * *buf - | 450 | * *buf - |
451 | * start_page - | 451 | * start_page - |
452 | * | 452 | * |
453 | * Output(s): | 453 | * Output(s): |
454 | * N/A | 454 | * N/A |
@@ -584,7 +584,7 @@ retry: | |||
584 | * This was for the ALPHA version only, but enough people have | 584 | * This was for the ALPHA version only, but enough people have |
585 | * been encountering problems so it is still here. | 585 | * been encountering problems so it is still here. |
586 | */ | 586 | */ |
587 | 587 | ||
588 | { | 588 | { |
589 | /* DMA termination address check... */ | 589 | /* DMA termination address check... */ |
590 | int addr, tries = 20; | 590 | int addr, tries = 20; |
@@ -614,7 +614,7 @@ retry: | |||
614 | break; | 614 | break; |
615 | } | 615 | } |
616 | } | 616 | } |
617 | 617 | ||
618 | ei_obp(ENISR_RDC, base + EN0_ISR); /* Ack intr. */ | 618 | ei_obp(ENISR_RDC, base + EN0_ISR); /* Ack intr. */ |
619 | ei_status.dmaing &= ~0x01; | 619 | ei_status.dmaing &= ~0x01; |
620 | } | 620 | } |