diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/media/dvb/dvb-usb/cxusb.c | |
parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/media/dvb/dvb-usb/cxusb.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index 127a94b9a1b5..bac2ae3b4a1f 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include "cx22702.h" | 28 | #include "cx22702.h" |
29 | #include "lgdt330x.h" | 29 | #include "lgdt330x.h" |
30 | #include "lgh06xf.h" | ||
31 | #include "mt352.h" | 30 | #include "mt352.h" |
32 | #include "mt352_priv.h" | 31 | #include "mt352_priv.h" |
33 | #include "zl10353.h" | 32 | #include "zl10353.h" |
@@ -388,7 +387,8 @@ static int cxusb_dtt7579_tuner_attach(struct dvb_usb_adapter *adap) | |||
388 | 387 | ||
389 | static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap) | 388 | static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap) |
390 | { | 389 | { |
391 | dvb_attach(lgh06xf_attach, adap->fe, &adap->dev->i2c_adap); | 390 | dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap, |
391 | &dvb_pll_lg_tdvs_h06xf); | ||
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | 394 | ||