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

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/i386/Kconfig
Simple merge

diff --cc drivers/atm/firestream.c
Simple merge

diff --cc drivers/ide/pci/aec62xx.c
Simple merge

diff --cc drivers/ide/pci/pdc202xx_new.c
Simple merge

diff --cc drivers/ide/pci/pdc202xx_old.c
index 26bc688a18212a748f2779de3ef64c0d962b3ce0,ffbef74013e607f4f4b18fc705ce5a8336516d9f..1e209d8f9437f4e04199bc8b4365d4c48bd0f298
--- 1/drivers/ide/pci/pdc202xx_old.c
--- 2/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@@ -490,10 -544,34 +490,10 @@@ static unsigned int __devinit init_chip
        if (dev->resource[PCI_ROM_RESOURCE].start) {
                pci_write_config_dword(dev, PCI_ROM_ADDRESS,
                        dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-                       name, dev->resource[PCI_ROM_RESOURCE].start);
+               printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+                       (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
        }
  
 -      /*
 -       * software reset -  this is required because the bios
 -       * will set UDMA timing on if the hdd supports it. The
 -       * user may want to turn udma off. A bug in the pdc20262
 -       * is that it cannot handle a downgrade in timing from
 -       * UDMA to DMA. Disk accesses after issuing a set
 -       * feature command will result in errors. A software
 -       * reset leaves the timing registers intact,
 -       * but resets the drives.
 -       */
 -#if 0
 -      if ((dev->device == PCI_DEVICE_ID_PROMISE_20267) ||
 -          (dev->device == PCI_DEVICE_ID_PROMISE_20265) ||
 -          (dev->device == PCI_DEVICE_ID_PROMISE_20263) ||
 -          (dev->device == PCI_DEVICE_ID_PROMISE_20262)) {
 -              unsigned long high_16   = pci_resource_start(dev, 4);
 -              byte udma_speed_flag    = inb(high_16 + 0x001f);
 -              outb(udma_speed_flag | 0x10, high_16 + 0x001f);
 -              mdelay(100);
 -              outb(udma_speed_flag & ~0x10, high_16 + 0x001f);
 -              mdelay(2000);   /* 2 seconds ?! */
 -      }
 -
 -#endif
        return dev->irq;
  }
  

diff --cc drivers/message/i2o/iop.c
Simple merge

diff --cc drivers/mtd/devices/pmc551.c
Simple merge

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/scsi/sata_via.c
Simple merge

diff --cc include/linux/ioport.h
index edfc733b1575c4f4c5d47644784e83e1d0d32a75,d4895236b7e96bf3b2dbdee35b49070adddc7beb..87a9fc039b4789e6d68e65510cb06bafaf18c801
--- 1/include/linux/ioport.h
--- 2/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@@ -96,18 -98,14 +98,17 @@@ extern struct resource * ____request_re
  extern int release_resource(struct resource *new);
  extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new);
  extern int allocate_resource(struct resource *root, struct resource *new,
-                            unsigned long size,
-                            unsigned long min, unsigned long max,
-                            unsigned long align,
+                            resource_size_t size, resource_size_t min,
+                            resource_size_t max, resource_size_t align,
                             void (*alignf)(void *, struct resource *,
-                                           unsigned long, unsigned long),
+                                           resource_size_t, resource_size_t),
                             void *alignf_data);
- int adjust_resource(struct resource *res, unsigned long start,
-                   unsigned long size);
+ int adjust_resource(struct resource *res, resource_size_t start,
+                   resource_size_t size);
  
 +/* get registered SYSTEM_RAM resources in specified area */
 +extern int find_next_system_ram(struct resource *res);
 +
  /* Convenience shorthand with allocation */
  #define request_region(start,n,name)  __request_region(&ioport_resource, (start), (n), (name))
  #define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))

diff --cc kernel/resource.c
Simple merge

diff --cc mm/Kconfig
Simple merge