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

[linux-2.6-omap-h63xx.git] / arch / x86 / pci / irq.c

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index c52150fdf82b51015515c1a7bb3716be515a7ef7..88d8f5c0ecb5e2e8bb5bc05f5aff97790ddd667a 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -169,7 +169,7 @@ void eisa_set_level_irq(unsigned int irq)
 }
 
 /*
- * Common IRQ routing practice: nybbles in config space,
+ * Common IRQ routing practice: nibbles in config space,
  * offset by some magic constant.
  */
 static unsigned int read_config_nybble(struct pci_dev *router, unsigned offset, unsigned nr)
@@ -585,7 +585,7 @@ static __init int via_router_probe(struct irq_router *r,
        /* FIXME: We should move some of the quirk fixup stuff here */
 
        /*
-        * work arounds for some buggy BIOSes
+        * workarounds for some buggy BIOSes
         */
        if (device == PCI_DEVICE_ID_VIA_82C586_0) {
                switch(router->device) {