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_APCI1710.c

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index 912bc0fc54bf3922574e6bbb8efb254aaaa5c7ef..a76ed2553fb427697eb127476a67bd93a14ab620 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -225,7 +225,7 @@ int i_APCI1710_Reset(struct comedi_device *dev)
 
        devpriv->s_BoardInfos.b_BoardVersion = 1;
 
-       /*  Enable the interrupt for the controler */
+       /*  Enable the interrupt for the controller */
        dw_Dummy = inl(devpriv->s_BoardInfos.ui_Address + 0x38);
        outl(dw_Dummy | 0x2000, devpriv->s_BoardInfos.ui_Address + 0x38);