Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / addi-data / addi_common.c

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 93d7c056741d9367cb648302bf45da01711270d3..76f2483871a780b6b60140020d686d09218d1980 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -2710,10 +2710,10 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
                        } else {
                                outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
                        }
-                       /*  Enable the interrupt for the controler */
+                       /*  Enable the interrupt for the controller */
                        dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
                        outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
-                       printk("\nEnable the interrupt for the controler");
+                       printk("\nEnable the interrupt for the controller");
                }
                printk("\nRead Eeprom");
                i_EepromReadMainHeader(io_addr[0], this_board->pc_EepromChip,