Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[pandora-kernel.git] / drivers / isdn / hisax / nj_s.c

diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index 2344e7b..a1b8952 100644 (file)
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -167,7 +167,7 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
                return(0);
        }
        /* the TJ300 and TJ320 must be detected, the IRQ handling is different
-        * unfortunatly the chips use the same device ID, but the TJ320 has
+        * unfortunately the chips use the same device ID, but the TJ320 has
         * the bit20 in status PCI cfg register set
         */
        pci_read_config_dword(dev_netjet, 0x04, &cfg);