Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: export length of os_hpmc vector
  parisc: fix kernel crash (protection id trap) when compiling ruby1.9
  parisc: Use DEFINE_SPINLOCK
  parisc: add uevent helper for parisc bus
  parisc: fix ipv6 checksum
  parisc: quiet palo not-found message from "which"
  parisc: Replace NR_CPUS in parisc code
  parisc: trivial fixes
  parisc: fix braino in commit adding __space_to_prot
  parisc: factor out sid to protid conversion
  parisc: use leX_to_cpu in place of __fswabX
  parisc: fix GFP_KERNEL use while atomic in unwinder
  parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
  parisc: set_time() catch errors
  parisc: use the new byteorder headers
  parisc: drivers/parisc/: make code static
  parisc: lib/: make code static

diff --combined drivers/parisc/dino.c
index 77cc8bfef8c9aca1bf9eb141db38fa3626588675,c5a44ff1f32f28f64d8c345ae663809fef7233d8..d539d9df88e7648cca17415ac6ce1a8ceffd2513
--- 1/drivers/parisc/dino.c
--- 2/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@@ -287,7 -287,7 +287,7 @@@ DINO_PORT_OUT(b,  8, 3
  DINO_PORT_OUT(w, 16, 2)
  DINO_PORT_OUT(l, 32, 0)
  
- struct pci_port_ops dino_port_ops = {
+ static struct pci_port_ops dino_port_ops = {
        .inb    = dino_in8,
        .inw    = dino_in16,
        .inl    = dino_in32,
@@@ -547,7 -547,7 +547,7 @@@ dino_card_fixup(struct pci_dev *dev
        ** The additional "-1" adjusts for skewing the IRQ<->slot.
        */
        dino_cfg_read(dev->bus, dev->devfn, PCI_INTERRUPT_PIN, 1, &irq_pin); 
 -      dev->irq = (irq_pin + PCI_SLOT(dev->devfn) - 1) % 4 ;
 +      dev->irq = pci_swizzle_interrupt_pin(dev, irq_pin) - 1;
  
        /* Shouldn't really need to do this but it's in case someone tries
        ** to bypass PCI services and look at the card themselves.
@@@ -672,7 -672,7 +672,7 @@@ dino_fixup_bus(struct pci_bus *bus
                        
                        dino_cfg_read(dev->bus, dev->devfn, 
                                      PCI_INTERRUPT_PIN, 1, &irq_pin);
 -                      irq_pin = (irq_pin + PCI_SLOT(dev->devfn) - 1) % 4 ;
 +                      irq_pin = pci_swizzle_interrupt_pin(dev, irq_pin) - 1;
                        printk(KERN_WARNING "Device %s has undefined IRQ, "
                                        "setting to %d\n", pci_name(dev), irq_pin);
                        dino_cfg_write(dev->bus, dev->devfn, 
@@@ -690,7 -690,7 +690,7 @@@
  }
  
  
- struct pci_bios_ops dino_bios_ops = {
+ static struct pci_bios_ops dino_bios_ops = {
        .init           = dino_bios_init,
        .fixup_bus      = dino_fixup_bus
  };