diff options
| author | Grant Grundler <grundler@parisc-linux.org> | 2006-09-08 11:15:39 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:37 -0400 |
| commit | 7f2b12482c86d69ed1804d239a52ea846ef294f2 (patch) | |
| tree | 5bcb8d6c4d9a90634595cf2d4e4a40302dab5e67 /drivers/net/tulip/tulip_core.c | |
| parent | 0bb3cf726b37c13abce9f9134a68b94aa10e8803 (diff) | |
[PATCH] Clean up tulip.h
Update/cleanup some definitions in tulip.h and tulip_core.c.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Valerie Henson <val_henson@linux.intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tulip/tulip_core.c')
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 7e1ca3cae1ee..def5999f987b 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -1357,11 +1357,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, if (pci_request_regions (pdev, "tulip")) goto err_out_free_netdev; -#ifndef USE_IO_OPS - ioaddr = pci_iomap(pdev, 1, tulip_tbl[chip_idx].io_size); -#else - ioaddr = pci_iomap(pdev, 0, tulip_tbl[chip_idx].io_size); -#endif + ioaddr = pci_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size); + if (!ioaddr) goto err_out_free_res; |