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, 5 insertions, 5 deletions

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 598a115cd00e..cbb69cf41311 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -80,8 +80,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
         } else {
                 if (res->flags & IORESOURCE_ROM_COPY) {
                         *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
-                        return (void __iomem *)pci_resource_start(pdev,
-                                                             PCI_ROM_RESOURCE);
+                        return (void __iomem *)(unsigned long)
+                                pci_resource_start(pdev, PCI_ROM_RESOURCE);
                 } else {
                         /* assign the ROM an address if it doesn't have one */
                         if (res->parent == NULL &&
@@ -170,11 +170,11 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)
                 return rom;
 
         res->end = res->start + *size;
-        memcpy_fromio((void*)res->start, rom, *size);
+        memcpy_fromio((void*)(unsigned long)res->start, rom, *size);
         pci_unmap_rom(pdev, rom);
         res->flags |= IORESOURCE_ROM_COPY;
 
-        return (void __iomem *)res->start;
+        return (void __iomem *)(unsigned long)res->start;
 }
 
 /**
@@ -227,7 +227,7 @@ void pci_cleanup_rom(struct pci_dev *pdev)
 {
         struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
         if (res->flags & IORESOURCE_ROM_COPY) {
-                kfree((void*)res->start);
+                kfree((void*)(unsigned long)res->start);
                 res->flags &= ~IORESOURCE_ROM_COPY;
                 res->start = 0;
                 res->end = 0;