From ed4861116e909d7de21c469596fd62a8078d4849 Mon Sep 17 00:00:00 2001 From: Grant Grundler Date: Fri, 8 Sep 2006 11:15:35 -0700 Subject: [PATCH] --- yaml --- r: 35268 b: refs/heads/master c: c69f412219855c9525c96052a65b60814531977c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/tulip_core.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c540f6752d5..7859226d788c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b92801b43441f1f0280c332b966b75c74222060 +refs/heads/master: c69f412219855c9525c96052a65b60814531977c diff --git a/trunk/drivers/net/tulip/tulip_core.c b/trunk/drivers/net/tulip/tulip_core.c index 6e111217e9cf..b333bea403d1 100644 --- a/trunk/drivers/net/tulip/tulip_core.c +++ b/trunk/drivers/net/tulip/tulip_core.c @@ -1644,8 +1644,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, if (register_netdev(dev)) goto err_out_free_ring; - printk(KERN_INFO "%s: %s rev %d at %p,", - dev->name, chip_name, chip_rev, ioaddr); + printk(KERN_INFO "%s: %s rev %d at " +#ifdef CONFIG_TULIP_MMIO + "MMIO" +#else + "Port" +#endif + " %#llx,", dev->name, chip_name, chip_rev, + (unsigned long long) pci_resource_start(pdev, TULIP_BAR)); pci_set_drvdata(pdev, dev); if (eeprom_missing)