Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  [PATCH] i386: export memory more than 4G through /proc/iomem
  [PATCH] 64bit Resource: finally enable 64bit resource sizes
  [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed
  [PATCH] 64bit resource: change pnp core to use resource_size_t
  [PATCH] 64bit resource: change pci core and arch code to use resource_size_t
  [PATCH] 64bit resource: change resource core to use resource_size_t
  [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource
  [PATCH] 64bit resource: fix up printks for resources in misc drivers
  [PATCH] 64bit resource: fix up printks for resources in arch and core code
  [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers
  [PATCH] 64bit resource: fix up printks for resources in video drivers
  [PATCH] 64bit resource: fix up printks for resources in ide drivers
  [PATCH] 64bit resource: fix up printks for resources in mtd drivers
  [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers
  [PATCH] 64bit resource: fix up printks for resources in networks drivers
  [PATCH] 64bit resource: fix up printks for resources in sound drivers
  [PATCH] 64bit resource: C99 changes for struct resource declarations

Fixed up trivial conflict in drivers/ide/pci/cmd64x.c (the printk that
was changed by the 64-bit resources had been deleted in the meantime ;)

1 files changed, 8 insertions, 6 deletions

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index b678814975c9..be98f6377339 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1170,9 +1170,10 @@ 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%08lx:%08lx)\n",
-                                       i, rnames[i], chip->rsrc[i].start,
-                                       chip->rsrc[i].end);
+                                       " %d (%s: 0x%016lx:%016lx)\n",
+                                       i, rnames[i],
+                                       (unsigned long long)chip->rsrc[i].start,
+                                       (unsigned long long)chip->rsrc[i].end);
                                 err = -ENODEV;
                                 goto __error;
                         }
@@ -1201,9 +1202,10 @@ 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%08lx:%08lx)\n",
-                                       i, rnames[i], chip->rsrc[i].start,
-                                       chip->rsrc[i].end);
+                                       " %d (%s: 0x%016llx:%016llx)\n",
+                                       i, rnames[i],
+                                       (unsigned long long)chip->rsrc[i].start,
+                                       (unsigned long long)chip->rsrc[i].end);
                                 err = -ENODEV;
                                 goto __error;
                         }