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 / hwdrv_apci3200.c

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index b943a06e70dcd503b6ccaabeb30dffb3e965f957..a93e2349ad3a3b14ce426191733814add3c0aaf9 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -3011,7 +3011,7 @@ int i_APCI3200_Reset(struct comedi_device *dev)
 
        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);
        outl(0, devpriv->i_IobaseAddon);        /* Resets the output */