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

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 6ded527169f4..7bb892f58cc0 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -241,7 +241,7 @@ int pnp_check_port(struct pnp_dev * dev, int idx)
 {
         int tmp;
         struct pnp_dev *tdev;
-        unsigned long *port, *end, *tport, *tend;
+        resource_size_t *port, *end, *tport, *tend;
         port = &dev->res.port_resource[idx].start;
         end = &dev->res.port_resource[idx].end;
 
@@ -297,7 +297,7 @@ int pnp_check_mem(struct pnp_dev * dev, int idx)
 {
         int tmp;
         struct pnp_dev *tdev;
-        unsigned long *addr, *end, *taddr, *tend;
+        resource_size_t *addr, *end, *taddr, *tend;
         addr = &dev->res.mem_resource[idx].start;
         end = &dev->res.mem_resource[idx].end;
 
@@ -358,7 +358,7 @@ int pnp_check_irq(struct pnp_dev * dev, int idx)
 {
         int tmp;
         struct pnp_dev *tdev;
-        unsigned long * irq = &dev->res.irq_resource[idx].start;
+        resource_size_t * irq = &dev->res.irq_resource[idx].start;
 
         /* if the resource doesn't exist, don't complain about it */
         if (cannot_compare(dev->res.irq_resource[idx].flags))
@@ -423,7 +423,7 @@ int pnp_check_dma(struct pnp_dev * dev, int idx)
 #ifndef CONFIG_IA64
         int tmp;
         struct pnp_dev *tdev;
-        unsigned long * dma = &dev->res.dma_resource[idx].start;
+        resource_size_t * dma = &dev->res.dma_resource[idx].start;
 
         /* if the resource doesn't exist, don't complain about it */
         if (cannot_compare(dev->res.dma_resource[idx].flags))