include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / dvb / dvb-core / dvb_frontend.h

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 9e46f17..bf0e6be 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -36,6 +36,7 @@
 #include <linux/errno.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <linux/dvb/frontend.h>
 
@@ -160,7 +161,7 @@ struct tuner_state {
  * search callback possible return status
  *
  * DVBFE_ALGO_SEARCH_SUCCESS
- * The frontend search algorithm completed and returned succesfully
+ * The frontend search algorithm completed and returned successfully
  *
  * DVBFE_ALGO_SEARCH_ASLEEP
  * The frontend search algorithm is sleeping
@@ -214,14 +215,14 @@ struct dvb_tuner_ops {
        int (*get_status)(struct dvb_frontend *fe, u32 *status);
        int (*get_rf_strength)(struct dvb_frontend *fe, u16 *strength);
 
-       /** These are provided seperately from set_params in order to facilitate silicon
-        * tuners which require sophisticated tuning loops, controlling each parameter seperately. */
+       /** These are provided separately from set_params in order to facilitate silicon
+        * tuners which require sophisticated tuning loops, controlling each parameter separately. */
        int (*set_frequency)(struct dvb_frontend *fe, u32 frequency);
        int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);
 
        /*
-        * These are provided seperately from set_params in order to facilitate silicon
-        * tuners which require sophisticated tuning loops, controlling each parameter seperately.
+        * These are provided separately from set_params in order to facilitate silicon
+        * tuners which require sophisticated tuning loops, controlling each parameter separately.
         */
        int (*set_state)(struct dvb_frontend *fe, enum tuner_param param, struct tuner_state *state);
        int (*get_state)(struct dvb_frontend *fe, enum tuner_param param, struct tuner_state *state);
@@ -355,6 +356,9 @@ struct dtv_frontend_properties {
            fe_modulation_t     modulation;
            u8                  interleaving;
        } layer[3];
+
+       /* ISDB-T specifics */
+       u32                     isdbs_ts_id;
 };
 
 struct dvb_frontend {