diff options
author | 2006-06-12 15:20:16 -0700 | |
---|---|---|
committer | 2006-06-27 09:23:59 -0700 | |
commit | e29419fffceb8ec36def3c922040e1ca7bcd3de5 (patch) | |
tree | c4e51cdee86dec7c859b1e7c7929c8bb2e85f36d /drivers/atm | |
parent | [PATCH] 64bit resource: fix up printks for resources in arch and core code (diff) | |
download | linux-e29419fffceb8ec36def3c922040e1ca7bcd3de5.tar.gz linux-e29419fffceb8ec36def3c922040e1ca7bcd3de5.tar.bz2 linux-e29419fffceb8ec36def3c922040e1ca7bcd3de5.zip |
[PATCH] 64bit resource: fix up printks for resources in misc drivers
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/atm')
-rw-r--r-- | drivers/atm/ambassador.c | 3 | ||||
-rw-r--r-- | drivers/atm/firestream.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 4b6bf19c39c0..4048681f36d5 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -2257,7 +2257,8 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ } PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at" - " IO %lx, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1), + " IO %llx, IRQ %u, MEM %p", + (unsigned long long)pci_resource_start(pci_dev, 1), irq, bus_to_virt(pci_resource_start(pci_dev, 0))); // check IO region diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index f2eeaf9dc56a..e1177169d57a 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c @@ -1657,9 +1657,10 @@ static int __devinit fs_init (struct fs_dev *dev) func_enter (); pci_dev = dev->pci_dev; - printk (KERN_INFO "found a FireStream %d card, base %08lx, irq%d.\n", + printk (KERN_INFO "found a FireStream %d card, base %16llx, irq%d.\n", IS_FS50(dev)?50:155, - pci_resource_start(pci_dev, 0), dev->pci_dev->irq); + (unsigned long long)pci_resource_start(pci_dev, 0), + dev->pci_dev->irq); if (fs_debug & FS_DEBUG_INIT) my_hd ((unsigned char *) dev, sizeof (*dev)); |