Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (27 commits)
  parisc: use generic atomic64 on 32-bit
  parisc: superio: fix build breakage
  parisc: Fix PCI resource allocation on non-PAT SBA machines
  parisc: perf: wire up sys_perf_counter_open
  parisc: add task_pt_regs macro
  parisc: wire sys_perf_counter_open to sys_ni_syscall
  parisc: inventory.c, fix bloated stack frame
  parisc: processor.c, fix bloated stack frame
  parisc: fix compile warning in mm/init.c
  parisc: remove dead code from sys_parisc32.c
  parisc: wire up rt_tgsigqueueinfo
  parisc: ensure broadcast tlb purge runs single threaded
  parisc: fix "delay!" timer handling
  parisc: fix mismatched parenthesis in memcpy.c
  parisc: Fix gcc 4.4 warning in lba_pci.c
  parisc: add parameter to read_cr16()
  parisc: decode_exc.c should include kernel.h
  parisc: remove obsolete hw_interrupt_type
  parisc: fix irq compile bugs in arch/parisc/kernel/irq.c
  parisc: advertise PCI devs after "assign_resources"
  ...

Manually fixed up trivial conflicts in tools/perf/perf.h due to addition
of SH vs HPPA perf-counter support.

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 52ae0b1d470c..c590974e9815 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -353,7 +353,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
         return 0;
 }
 
-static struct hw_interrupt_type dino_interrupt_type = {
+static struct irq_chip dino_interrupt_type = {
         .typename       = "GSC-PCI",
         .startup        = dino_startup_irq,
         .shutdown       = dino_disable_irq,
@@ -1019,22 +1019,22 @@ static int __init dino_probe(struct parisc_device *dev)
         ** It's not used to avoid chicken/egg problems
         ** with configuration accessor functions.
         */
-        bus = pci_scan_bus_parented(&dev->dev, dino_current_bus,
-                                    &dino_cfg_ops, NULL);
+        dino_dev->hba.hba_bus = bus = pci_scan_bus_parented(&dev->dev,
+                         dino_current_bus, &dino_cfg_ops, NULL);
+
         if(bus) {
-                pci_bus_add_devices(bus);
                 /* This code *depends* on scanning being single threaded
                  * if it isn't, this global bus number count will fail
                  */
                 dino_current_bus = bus->subordinate + 1;
                 pci_bus_assign_resources(bus);
+                pci_bus_add_devices(bus);
         } else {
-                printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n",
+                printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",
                        dev_name(&dev->dev), dino_current_bus);
                 /* increment the bus number in case of duplicates */
                 dino_current_bus++;
         }
-        dino_dev->hba.hba_bus = bus;
         return 0;
 }