aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/apne.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/apne.c')
-rw-r--r--drivers/net/apne.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index b9820b86cdc..643b08cc740 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -132,9 +132,9 @@ struct net_device * __init apne_probe(int unit)
132 132
133 if ( !(AMIGAHW_PRESENT(PCMCIA)) ) 133 if ( !(AMIGAHW_PRESENT(PCMCIA)) )
134 return ERR_PTR(-ENODEV); 134 return ERR_PTR(-ENODEV);
135 135
136 printk("Looking for PCMCIA ethernet card : "); 136 printk("Looking for PCMCIA ethernet card : ");
137 137
138 /* check if a card is inserted */ 138 /* check if a card is inserted */
139 if (!(PCMCIA_INSERTED)) { 139 if (!(PCMCIA_INSERTED)) {
140 printk("NO PCMCIA card inserted\n"); 140 printk("NO PCMCIA card inserted\n");
@@ -205,7 +205,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
205 int neX000, ctron; 205 int neX000, ctron;
206#endif 206#endif
207 static unsigned version_printed; 207 static unsigned version_printed;
208 208
209 if (ei_debug && version_printed++ == 0) 209 if (ei_debug && version_printed++ == 0)
210 printk(version); 210 printk(version);
211 211
@@ -261,13 +261,13 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
261 261
262 /* At this point, wordlength *only* tells us if the SA_prom is doubled 262 /* At this point, wordlength *only* tells us if the SA_prom is doubled
263 up or not because some broken PCI cards don't respect the byte-wide 263 up or not because some broken PCI cards don't respect the byte-wide
264 request in program_seq above, and hence don't have doubled up values. 264 request in program_seq above, and hence don't have doubled up values.
265 These broken cards would otherwise be detected as an ne1000. */ 265 These broken cards would otherwise be detected as an ne1000. */
266 266
267 if (wordlength == 2) 267 if (wordlength == 2)
268 for (i = 0; i < 16; i++) 268 for (i = 0; i < 16; i++)
269 SA_prom[i] = SA_prom[i+i]; 269 SA_prom[i] = SA_prom[i+i];
270 270
271 if (wordlength == 2) { 271 if (wordlength == 2) {
272 /* We must set the 8390 for word mode. */ 272 /* We must set the 8390 for word mode. */
273 outb(0x49, ioaddr + NE_EN0_DCFG); 273 outb(0x49, ioaddr + NE_EN0_DCFG);
@@ -313,7 +313,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
313 dev->base_addr = ioaddr; 313 dev->base_addr = ioaddr;
314 314
315 /* Install the Interrupt handler */ 315 /* Install the Interrupt handler */
316 i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, DRV_NAME, dev); 316 i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
317 if (i) return i; 317 if (i) return i;
318 318
319 for(i = 0; i < ETHER_ADDR_LEN; i++) { 319 for(i = 0; i < ETHER_ADDR_LEN; i++) {