diff options
-rw-r--r-- | drivers/macintosh/macio_asic.c | 4 | ||||
-rw-r--r-- | sound/ppc/pmac.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index d832e109b1b1..40ae7b6a939d 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
@@ -427,10 +427,10 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, | |||
427 | 427 | ||
428 | /* MacIO itself has a different reg, we use it's PCI base */ | 428 | /* MacIO itself has a different reg, we use it's PCI base */ |
429 | if (np == chip->of_node) { | 429 | if (np == chip->of_node) { |
430 | sprintf(dev->ofdev.dev.bus_id, "%1d.%016llx:%.*s", | 430 | sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s", |
431 | chip->lbus.index, | 431 | chip->lbus.index, |
432 | #ifdef CONFIG_PCI | 432 | #ifdef CONFIG_PCI |
433 | (unsigned long long)pci_resource_start(chip->lbus.pdev, 0), | 433 | (unsigned int)pci_resource_start(chip->lbus.pdev, 0), |
434 | #else | 434 | #else |
435 | 0, /* NuBus may want to do something better here */ | 435 | 0, /* NuBus may want to do something better here */ |
436 | #endif | 436 | #endif |
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index be98f6377339..90db9a1d1e0a 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -1170,7 +1170,7 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) | |||
1170 | chip->rsrc[i].start + 1, | 1170 | chip->rsrc[i].start + 1, |
1171 | rnames[i]) == NULL) { | 1171 | rnames[i]) == NULL) { |
1172 | printk(KERN_ERR "snd: can't request rsrc " | 1172 | printk(KERN_ERR "snd: can't request rsrc " |
1173 | " %d (%s: 0x%016lx:%016lx)\n", | 1173 | " %d (%s: 0x%016llx:%016llx)\n", |
1174 | i, rnames[i], | 1174 | i, rnames[i], |
1175 | (unsigned long long)chip->rsrc[i].start, | 1175 | (unsigned long long)chip->rsrc[i].start, |
1176 | (unsigned long long)chip->rsrc[i].end); | 1176 | (unsigned long long)chip->rsrc[i].end); |