Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / 4xx / sycamore.c

diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c
index c47493e344c2d860bfc6de4f1112549365ee9805..8689f3e8ef3a35dd15026713054e2733a1577483 100644 (file)
--- a/arch/ppc/platforms/4xx/sycamore.c
+++ b/arch/ppc/platforms/4xx/sycamore.c
@@ -225,7 +225,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
                    hose->first_busno, PCI_SLOT(hose->first_busno),
                    PCI_FUNC(hose->first_busno), bar, bar_response);
        }
-       /* end work arround */
+       /* end workaround */
 
 #ifdef DEBUG
        printk("PCI bridge regs after fixup \n");