Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / arch / sparc / kernel / pci_psycho.c

diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index dfb3ec892987ec8cca3900693d76f1df3ed2b234..3b34344082ef17616687e847b5df0d5209b0bcd6 100644 (file)
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -307,10 +307,7 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)
 
        /* We really mean to ignore the return result here.  Two
         * PCI controller share the same interrupt numbers and
-        * drive the same front-end hardware.  Whichever of the
-        * two get in here first will register the IRQ handler
-        * the second will just error out since we do not pass in
-        * IRQF_SHARED.
+        * drive the same front-end hardware.
         */
        err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED,
                          "PSYCHO_UE", pbm);