commit 7f2b12482c86d69ed1804d239a52ea846ef294f2
author Grant Grundler <grundler@parisc-linux.org> Fri Sep 08 11:15:39 2006 -0700
committer Jeff Garzik <jeff@garzik.org> Mon Sep 11 09:05:37 2006 -0400
tree 5bcb8d6c4d9a90634595cf2d4e4a40302dab5e67
parent 0bb3cf726b37c13abce9f9134a68b94aa10e8803

[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>

drivers/net/tulip/tulip_core.c

diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7e1ca3c..def5999 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1357,11 +1357,8 @@
 	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;