From 5e622deac985cc0eb04a7694fa4ec0d38222dab4 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sun, 2 Jul 2006 11:55:03 +1000 Subject: [PATCH] --- yaml --- r: 31601 b: refs/heads/master c: d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc h: refs/heads/master i: 31599: c740d5f5169cd0b8c18d0af147142b37e88e5c5b v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/macio_asic.c | 4 ++-- trunk/sound/ppc/pmac.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 837f6878b9b6..cff1e79bab6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc25465f09414538afdbceacc517dd4dbabadeca +refs/heads/master: d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc diff --git a/trunk/drivers/macintosh/macio_asic.c b/trunk/drivers/macintosh/macio_asic.c index d832e109b1b1..40ae7b6a939d 100644 --- a/trunk/drivers/macintosh/macio_asic.c +++ b/trunk/drivers/macintosh/macio_asic.c @@ -427,10 +427,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.%016llx:%.*s", + sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s", chip->lbus.index, #ifdef CONFIG_PCI - (unsigned long long)pci_resource_start(chip->lbus.pdev, 0), + (unsigned int)pci_resource_start(chip->lbus.pdev, 0), #else 0, /* NuBus may want to do something better here */ #endif diff --git a/trunk/sound/ppc/pmac.c b/trunk/sound/ppc/pmac.c index be98f6377339..90db9a1d1e0a 100644 --- a/trunk/sound/ppc/pmac.c +++ b/trunk/sound/ppc/pmac.c @@ -1170,7 +1170,7 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) chip->rsrc[i].start + 1, rnames[i]) == NULL) { printk(KERN_ERR "snd: can't request rsrc " - " %d (%s: 0x%016lx:%016lx)\n", + " %d (%s: 0x%016llx:%016llx)\n", i, rnames[i], (unsigned long long)chip->rsrc[i].start, (unsigned long long)chip->rsrc[i].end);