Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...

[pandora-kernel.git] / drivers / media / dvb / bt8xx / dvb-bt8xx.c

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 78fc469..1e1106d 100644 (file)
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -427,10 +427,10 @@ static void or51211_reset(struct dvb_frontend * fe)
        struct dvb_bt8xx_card *bt = fe->dvb->priv;
 
        /* RESET DEVICE
-        * reset is controled by GPIO-0
+        * reset is controlled by GPIO-0
         * when set to 0 causes reset and when to 1 for normal op
         * must remain reset for 128 clock cycles on a 50Mhz clock
-        * also PRM1 PRM2 & PRM4 are controled by GPIO-1,GPIO-2 & GPIO-4
+        * also PRM1 PRM2 & PRM4 are controlled by GPIO-1,GPIO-2 & GPIO-4
         * We assume that the reset has be held low long enough or we
         * have been reset by a power on.  When the driver is unloaded
         * reset set to 0 so if reloaded we have been reset.