Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings

18 files changed, 29 insertions, 29 deletions

diff --git a/drivers/media/dvb/frontends/atbm8830.h b/drivers/media/dvb/frontends/atbm8830.h
index e8149f393300..024273374bd8 100644
--- a/drivers/media/dvb/frontends/atbm8830.h
+++ b/drivers/media/dvb/frontends/atbm8830.h
@@ -39,7 +39,7 @@ struct atbm8830_config {
         /* parallel or serial transport stream */
         u8 serial_ts;
 
-        /* transport stream clock output only when receving valid stream */
+        /* transport stream clock output only when receiving valid stream */
         u8 ts_clk_gated;
 
         /* Decoder sample TS data at rising edge of clock */
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c
index 65f6a36dfb21..1d572940e243 100644
--- a/drivers/media/dvb/frontends/au8522_dig.c
+++ b/drivers/media/dvb/frontends/au8522_dig.c
@@ -635,7 +635,7 @@ static int au8522_led_gpio_enable(struct au8522_state *state, int onoff)
         struct au8522_led_config *led_config = state->config->led_cfg;
         u8 val;
 
-        /* bail out if we cant control an LED */
+        /* bail out if we can't control an LED */
         if (!led_config || !led_config->gpio_output ||
             !led_config->gpio_output_enable || !led_config->gpio_output_disable)
                 return 0;
@@ -665,7 +665,7 @@ static int au8522_led_ctrl(struct au8522_state *state, int led)
         struct au8522_led_config *led_config = state->config->led_cfg;
         int i, ret = 0;
 
-        /* bail out if we cant control an LED */
+        /* bail out if we can't control an LED */
         if (!led_config || !led_config->gpio_leds ||
             !led_config->num_led_states || !led_config->led_states)
                 return 0;
@@ -803,7 +803,7 @@ static int au8522_led_status(struct au8522_state *state, const u16 *snr)
         int led;
         u16 strong;
 
-        /* bail out if we cant control an LED */
+        /* bail out if we can't control an LED */
         if (!led_config)
                 return 0;
 
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index cf5e576dfdcf..8aff5868a5e1 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -155,7 +155,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len)
         unsigned long t;
 
 /* Check if any previous HAB request still needs to be serviced by the
- * Aquisition Processor before sending new request */
+ * Acquisition Processor before sending new request */
         if ((ret = bcm3510_readB(st,0xa8,&v)) < 0)
                 return ret;
         if (v.HABSTAT_a8.HABR) {
@@ -361,7 +361,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
 /* Set duration of the initial state of TUNCTL = 3.34 micro Sec */
         c.TUNCTL_state = 0x40;
 
-/* PRESCALER DEVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
+/* PRESCALER DIVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
         c.ctl_dat[0].ctrl.size = BITS_8;
         c.ctl_dat[0].data      = 0x80 | bc;
 
@@ -397,7 +397,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
         c.ctl_dat[7].ctrl.cs0  = 1;
         c.ctl_dat[7].data      = 0x40;
 
-/* PRESCALER DEVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
+/* PRESCALER DIVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
         c.ctl_dat[8].ctrl.size = BITS_8;
         c.ctl_dat[8].data      = 0x80;
 
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 5fbc0fc37ecd..0142214b0133 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -179,7 +179,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
         cx22700_writereg (state, 0x06, val);
 
         cx22700_writereg (state, 0x08, 0x04 | 0x02);  /* use user tps parameters */
-        cx22700_writereg (state, 0x08, 0x04);         /* restart aquisition */
+        cx22700_writereg (state, 0x08, 0x04);         /* restart acquisition */
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index ff6c4983051c..3139558148ba 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 
 /* Register values to initialise the demod */
 static const u8 init_tab[] = {
-        0x00, 0x00, /* Stop aquisition */
+        0x00, 0x00, /* Stop acquisition */
         0x0B, 0x06,
         0x09, 0x01,
         0x0D, 0x41,
@@ -310,7 +310,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
                         & 0xfc);
                 cx22702_writereg(state, 0x0C,
                         (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
-                cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */
+                cx22702_writereg(state, 0x00, 0x01); /* Begin acquisition */
                 dprintk("%s: Autodetecting\n", __func__);
                 return 0;
         }
@@ -424,7 +424,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
         cx22702_writereg(state, 0x0C,
                 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
 
-        /* Begin channel aquisition */
+        /* Begin channel acquisition */
         cx22702_writereg(state, 0x00, 0x01);
 
         return 0;
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 7a1a5bc337d8..bf9c999aa470 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -544,7 +544,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         cx24110_set_inversion (state, p->inversion);
         cx24110_set_fec (state, p->u.qpsk.fec_inner);
         cx24110_set_symbolrate (state, p->u.qpsk.symbol_rate);
-        cx24110_writereg(state,0x04,0x05); /* start aquisition */
+        cx24110_writereg(state,0x04,0x05); /* start acquisition */
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/cx24113.h b/drivers/media/dvb/frontends/cx24113.h
index 5de0f7ffd8d2..01eb7b9c28f4 100644
--- a/drivers/media/dvb/frontends/cx24113.h
+++ b/drivers/media/dvb/frontends/cx24113.h
@@ -1,5 +1,5 @@
 /*
- *  Driver for Conexant CX24113/CX24128 Tuner (Satelite)
+ *  Driver for Conexant CX24113/CX24128 Tuner (Satellite)
  *
  *  Copyright (C) 2007-8 Patrick Boettcher <pb@linuxtv.org>
  *
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index fad6a990a39b..b1dd8acc607a 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -949,7 +949,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,
         else
                 err("it seems I don't have a tuner...");
 
-        /* Enable automatic aquisition and reset cycle */
+        /* Enable automatic acquisition and reset cycle */
         cx24123_writereg(state, 0x03, (cx24123_readreg(state, 0x03) | 0x07));
         cx24123_writereg(state, 0x00, 0x10);
         cx24123_writereg(state, 0x00, 0);
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index a05007c80985..536f02b17338 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -1097,7 +1097,7 @@ static int drx397x_init(struct dvb_frontend *fe)
         s->config.ifagc.w0A = 0x3ff;
         s->config.ifagc.w0C = 0x388;
 
-        /* for signal strenght calculations */
+        /* for signal strength calculations */
         s->config.ss76 = 820;
         s->config.ss78 = 2200;
         s->config.ss7A = 150;
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
index 33b63235b86e..c283112051b1 100644
--- a/drivers/media/dvb/frontends/mb86a16.c
+++ b/drivers/media/dvb/frontends/mb86a16.c
@@ -1630,7 +1630,7 @@ static enum dvbfe_search mb86a16_search(struct dvb_frontend *fe,
         state->srate = p->u.qpsk.symbol_rate / 1000;
 
         if (!mb86a16_set_fe(state)) {
-                dprintk(verbose, MB86A16_ERROR, 1, "Succesfully acquired LOCK");
+                dprintk(verbose, MB86A16_ERROR, 1, "Successfully acquired LOCK");
                 return DVBFE_ALGO_SEARCH_SUCCESS;
         }
 
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c
index cc4acd2f920d..0f867a5055fb 100644
--- a/drivers/media/dvb/frontends/mb86a20s.c
+++ b/drivers/media/dvb/frontends/mb86a20s.c
@@ -406,7 +406,7 @@ err:
                 printk(KERN_INFO "mb86a20s: Init failed. Will try again later\n");
         } else {
                 state->need_init = false;
-                dprintk("Initialization succeded.\n");
+                dprintk("Initialization succeeded.\n");
         }
         return rc;
 }
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 472907d43460..83e6f1a1b700 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -670,7 +670,7 @@ static int mt312_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
                 if (ret < 0)
                         goto error;
 
-                /* preserve this bit to not accidently shutdown ADC */
+                /* preserve this bit to not accidentally shutdown ADC */
                 val &= 0x80;
                 break;
         }
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index e87b747ea99c..17f8cdf8afef 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -225,7 +225,7 @@ static int s5h1420_recv_slave_reply (struct dvb_frontend* fe,
         unsigned long timeout;
         int result = 0;
 
-        /* setup for DISEQC recieve */
+        /* setup for DISEQC receive */
         val = s5h1420_readreg(state, 0x3b);
         s5h1420_writereg(state, 0x3b, 0x82); /* FIXME: guess - do we need to set DIS_RDY(0x08) in receive mode? */
         msleep(15);
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c
index 64673b8b64a2..bc1a8af4f6e1 100644
--- a/drivers/media/dvb/frontends/stb6100.c
+++ b/drivers/media/dvb/frontends/stb6100.c
@@ -360,7 +360,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
         else
                 odiv = 0;
 
-        /* VCO enabled, seach clock off as per LL3.7, 3.4.1 */
+        /* VCO enabled, search clock off as per LL3.7, 3.4.1 */
         regs[STB6100_VCO] = 0xe0 | (odiv << STB6100_VCO_ODIV_SHIFT);
 
         /* OSM  */
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 4fd7479bb62b..84d88f33275e 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -435,7 +435,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
                 return -EINVAL;
         }
 
-        // determine inversion dependant parameters
+        // determine inversion dependent parameters
         inversion = p->inversion;
         if (state->config->invert)
                 inversion = (inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON;
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c
index 4e0e6a873b8c..e57ab53e2e27 100644
--- a/drivers/media/dvb/frontends/stv0367.c
+++ b/drivers/media/dvb/frontends/stv0367.c
@@ -1328,7 +1328,7 @@ stv0367_ter_signal_type stv0367ter_lock_algo(struct stv0367_state *state)
 
         /*guard=stv0367_readbits(state,F367TER_SYR_GUARD); */
 
-        /*supress EPQ auto for SYR_GARD 1/16 or 1/32
+        /*suppress EPQ auto for SYR_GARD 1/16 or 1/32
         and set channel predictor in automatic */
 #if 0
         switch (guard) {
diff --git a/drivers/media/dvb/frontends/stv0900_priv.h b/drivers/media/dvb/frontends/stv0900_priv.h
index b62b0f0a4fef..e0ea74c8e093 100644
--- a/drivers/media/dvb/frontends/stv0900_priv.h
+++ b/drivers/media/dvb/frontends/stv0900_priv.h
@@ -238,7 +238,7 @@ enum fe_stv0900_demod_mode {
 };
 
 struct stv0900_init_params{
-        u32     dmd_ref_clk;/* Refrence,Input clock for the demod in Hz */
+        u32     dmd_ref_clk;/* Reference,Input clock for the demod in Hz */
 
         /* Demodulator Type (single demod or dual demod) */
         enum fe_stv0900_demod_mode      demod_mode;
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 41d0f0a6655d..52d8712411e5 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -1424,7 +1424,7 @@ static int stv090x_start_search(struct stv090x_state *state)
                         if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0)
                                 goto err;
 
-                        /*enlarge the timing bandwith for Low SR*/
+                        /*enlarge the timing bandwidth for Low SR*/
                         if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0)
                                 goto err;
                 } else {
@@ -1432,17 +1432,17 @@ static int stv090x_start_search(struct stv090x_state *state)
                         Set The carrier search up and low to auto mode */
                         if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
                                 goto err;
-                        /*reduce the timing bandwith for high SR*/
+                        /*reduce the timing bandwidth for high SR*/
                         if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0)
                                 goto err;
                 }
         } else {
                 /* >= Cut 3 */
                 if (state->srate <= 5000000) {
-                        /* enlarge the timing bandwith for Low SR */
+                        /* enlarge the timing bandwidth for Low SR */
                         STV090x_WRITE_DEMOD(state, RTCS2, 0x68);
                 } else {
-                        /* reduce timing bandwith for high SR */
+                        /* reduce timing bandwidth for high SR */
                         STV090x_WRITE_DEMOD(state, RTCS2, 0x44);
                 }
 
@@ -2482,7 +2482,7 @@ static int stv090x_sw_algo(struct stv090x_state *state)
                                         dvbs2_fly_wheel = STV090x_GETFIELD_Px(reg, FLYWHEEL_CPT_FIELD);
                                 }
                                 if (dvbs2_fly_wheel < 0xd) {
-                                        /*FALSE lock, The demod is loosing lock */
+                                        /*FALSE lock, The demod is losing lock */
                                         lock = 0;
                                         if (trials < 2) {
                                                 if (state->internal->dev_ver >= 0x20) {
@@ -3202,7 +3202,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
                         goto err;
                 if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0)
                         goto err;
-                if (stv090x_set_srate(state, 1000000) < 0) /* inital srate = 1Msps */
+                if (stv090x_set_srate(state, 1000000) < 0) /* initial srate = 1Msps */
                         goto err;
         } else {
                 /* known srate */