diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/net/ni52.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/net/ni52.c')
| -rw-r--r-- | drivers/net/ni52.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index 1f2330133..7c3e60bb3 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c @@ -366,11 +366,11 @@ __initfunc(int ni52_probe(struct device *dev)) #endif int base_addr = dev->base_addr; - if (base_addr > 0x1ff) /* Check a single specified location. */ + if (base_addr > 0x1ff) { /* Check a single specified location. */ if( (inb(base_addr+NI52_MAGIC1) == NI52_MAGICVAL1) && (inb(base_addr+NI52_MAGIC2) == NI52_MAGICVAL2)) return ni52_probe1(dev, base_addr); - else if (base_addr > 0) /* Don't probe at all. */ + } else if (base_addr > 0) /* Don't probe at all. */ return ENXIO; #ifdef MODULE |