summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2006-06-13 00:20:16 +0200
committerGreg Kroah-Hartman2006-06-27 18:23:59 +0200
commite29419fffceb8ec36def3c922040e1ca7bcd3de5 (patch)
treec4e51cdee86dec7c859b1e7c7929c8bb2e85f36d /drivers/macintosh
parent[PATCH] 64bit resource: fix up printks for resources in arch and core code (diff)
downloadkernel-qcow2-linux-e29419fffceb8ec36def3c922040e1ca7bcd3de5.tar.gz
kernel-qcow2-linux-e29419fffceb8ec36def3c922040e1ca7bcd3de5.tar.xz
kernel-qcow2-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/macintosh')
-rw-r--r--drivers/macintosh/macio_asic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 431bd37225a1..c687ac703941 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -428,10 +428,10 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
/* MacIO itself has a different reg, we use it's PCI base */
if (np == chip->of_node) {
- sprintf(dev->ofdev.dev.bus_id, "%1d.%08lx:%.*s",
+ sprintf(dev->ofdev.dev.bus_id, "%1d.%016llx:%.*s",
chip->lbus.index,
#ifdef CONFIG_PCI
- pci_resource_start(chip->lbus.pdev, 0),
+ (unsigned long long)pci_resource_start(chip->lbus.pdev, 0),
#else
0, /* NuBus may want to do something better here */
#endif