aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/lance.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/lance.c')
-rw-r--r--drivers/net/lance.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index d7afb938ea62..d83d4010656d 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -391,7 +391,8 @@ MODULE_LICENSE("GPL");
391 */ 391 */
392static int __init do_lance_probe(struct net_device *dev) 392static int __init do_lance_probe(struct net_device *dev)
393{ 393{
394 int *port, result; 394 unsigned int *port;
395 int result;
395 396
396 if (high_memory <= phys_to_virt(16*1024*1024)) 397 if (high_memory <= phys_to_virt(16*1024*1024))
397 lance_need_isa_bounce_buffers = 0; 398 lance_need_isa_bounce_buffers = 0;
@@ -456,13 +457,13 @@ out:
456static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int options) 457static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int options)
457{ 458{
458 struct lance_private *lp; 459 struct lance_private *lp;
459 long dma_channels; /* Mark spuriously-busy DMA channels */ 460 unsigned long dma_channels; /* Mark spuriously-busy DMA channels */
460 int i, reset_val, lance_version; 461 int i, reset_val, lance_version;
461 const char *chipname; 462 const char *chipname;
462 /* Flags for specific chips or boards. */ 463 /* Flags for specific chips or boards. */
463 unsigned char hpJ2405A = 0; /* HP ISA adaptor */ 464 unsigned char hpJ2405A = 0; /* HP ISA adaptor */
464 int hp_builtin = 0; /* HP on-board ethernet. */ 465 int hp_builtin = 0; /* HP on-board ethernet. */
465 static int did_version; /* Already printed version info. */ 466 static int did_version; /* Already printed version info. */
466 unsigned long flags; 467 unsigned long flags;
467 int err = -ENOMEM; 468 int err = -ENOMEM;
468 void __iomem *bios; 469 void __iomem *bios;