diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/media/dvb/frontends/dvb-pll.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/dvb/frontends/dvb-pll.h')
| -rw-r--r-- | drivers/media/dvb/frontends/dvb-pll.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h index 205b2d1a8852..497d31dcf41e 100644 --- a/drivers/media/dvb/frontends/dvb-pll.h +++ b/drivers/media/dvb/frontends/dvb-pll.h | |||
| @@ -36,6 +36,10 @@ extern struct dvb_pll_desc dvb_pll_tda665x; | |||
| 36 | extern struct dvb_pll_desc dvb_pll_fmd1216me; | 36 | extern struct dvb_pll_desc dvb_pll_fmd1216me; |
| 37 | extern struct dvb_pll_desc dvb_pll_tded4; | 37 | extern struct dvb_pll_desc dvb_pll_tded4; |
| 38 | 38 | ||
| 39 | extern struct dvb_pll_desc dvb_pll_tuv1236d; | ||
| 40 | extern struct dvb_pll_desc dvb_pll_tdhu2; | ||
| 41 | extern struct dvb_pll_desc dvb_pll_tbmv30111in; | ||
| 42 | |||
| 39 | int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf, | 43 | int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf, |
| 40 | u32 freq, int bandwidth); | 44 | u32 freq, int bandwidth); |
| 41 | 45 | ||