diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-12 15:11:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-12 15:11:23 +1100 |
| commit | 3ab043250553016b49ea7f930f897bcdc2b48715 (patch) | |
| tree | c7ef3125c5ea80e8e57843dce48d460db0564c51 /drivers/media/dvb/dvb-core/dvb_frontend.h | |
| parent | 94a491ea06cda265cef850a6715b3c6bc9be68b5 (diff) | |
| parent | 5c42dc7070c94622ca914b5a2e227f3744e857e7 (diff) | |
Merge remote branch 'trivial/for-next'
Conflicts:
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/gpu/drm/radeon/atombios.h
Diffstat (limited to 'drivers/media/dvb/dvb-core/dvb_frontend.h')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 52e4ce4304ee..80dda308ff74 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -214,14 +214,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); |