Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[sfrench/cifs-2.6.git] / include / media / dvb_frontend.h

diff --git a/include/media/dvb_frontend.h b/include/media/dvb_frontend.h
index 6f7a85ab3541fbd7900a66db8493937dd42370ab..f05cd7b94a2cf9eda7c2bdea397ffc5f29f40b05 100644 (file)
--- a/include/media/dvb_frontend.h
+++ b/include/media/dvb_frontend.h
@@ -160,7 +160,7 @@ enum dvbfe_algo {
  *     The frontend search for a signal failed
  *
  * @DVBFE_ALGO_SEARCH_INVALID:
- *     The frontend search algorith was probably supplied with invalid
+ *     The frontend search algorithm was probably supplied with invalid
  *     parameters and the search is an invalid one
  *
  * @DVBFE_ALGO_SEARCH_ERROR:
@@ -204,7 +204,7 @@ enum dvbfe_search {
  * @set_config:                callback function used to send some tuner-specific
  *                     parameters.
  * @get_frequency:     get the actual tuned frequency
- * @get_bandwidth:     get the bandwitdh used by the low pass filters
+ * @get_bandwidth:     get the bandwidth used by the low pass filters
  * @get_if_frequency:  get the Intermediate Frequency, in Hz. For baseband,
  *                     should return 0.
  * @get_status:                returns the frontend lock status
@@ -232,7 +232,7 @@ struct dvb_tuner_ops {
        int (*suspend)(struct dvb_frontend *fe);
        int (*resume)(struct dvb_frontend *fe);
 
-       /* This is the recomended way to set the tuner */
+       /* This is the recommended way to set the tuner */
        int (*set_params)(struct dvb_frontend *fe);
        int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p);
 
@@ -358,7 +358,7 @@ struct dvb_frontend_internal_info {
  * @release:           callback function called when frontend is ready to be
  *                     freed.
  *                     drivers should free any allocated memory.
- * @release_sec:       callback function requesting that the Satelite Equipment
+ * @release_sec:       callback function requesting that the Satellite Equipment
  *                     Control (SEC) driver to release and free any memory
  *                     allocated by the driver.
  * @init:              callback function used to initialize the tuner device.