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 ;)

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 4505540e3c59..04a376ec0ed8 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -732,15 +732,15 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
         ioaddr = ioremap(pci_resource_start(pdev, 0),
                                         pci_resource_len(pdev, 0));
         if (!ioaddr) {
-                printk(KERN_ERR "%s: cannot remap MMIO region %lx @ %lx\n",
-                        DRV_NAME, pci_resource_len(pdev, 0),
-                        pci_resource_start(pdev, 0));
+                printk(KERN_ERR "%s: cannot remap MMIO region %llx @ %llx\n",
+                        DRV_NAME, (unsigned long long)pci_resource_len(pdev, 0),
+                        (unsigned long long)pci_resource_start(pdev, 0));
                 rc = -EIO;
                 goto err_free_mmio_regions_2;
         }
-        printk(KERN_DEBUG "Siemens DSCC4, MMIO at %#lx (regs), %#lx (lbi), IRQ %d\n",
-                pci_resource_start(pdev, 0),
-                pci_resource_start(pdev, 1), pdev->irq);
+        printk(KERN_DEBUG "Siemens DSCC4, MMIO at %#llx (regs), %#llx (lbi), IRQ %d\n",
+                (unsigned long long)pci_resource_start(pdev, 0),
+                (unsigned long long)pci_resource_start(pdev, 1), pdev->irq);
 
         /* Cf errata DS5 p.2 */
         pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xf8);
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index a3e65d1bc19b..d7897ae89f90 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3445,9 +3445,9 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
         if (card == NULL) {
-                printk("PC300 found at RAM 0x%08lx, "
+                printk("PC300 found at RAM 0x%016llx, "
                        "but could not allocate card structure.\n",
-                       pci_resource_start(pdev, 3));
+                       (unsigned long long)pci_resource_start(pdev, 3));
                 err = -ENOMEM;
                 goto err_disable_dev;
         }