diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-03-25 20:00:51 +0100 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-03-25 20:00:51 +0100 |
| commit | 46735ad8af710915abd37c810626ff9e36c647f4 (patch) | |
| tree | e9443b4c00dbc5274135659b7cd8e98b331d5372 /linux/drivers/media/dvb | |
| parent | 43950da130503eeb6f9a9304aa7b7d482d535ad6 (diff) | |
| parent | afb2abb44347c884e3a8a2ddf7151756c1869d2f (diff) | |
| download | mediapointer-dvb-s2-46735ad8af710915abd37c810626ff9e36c647f4.tar.gz mediapointer-dvb-s2-46735ad8af710915abd37c810626ff9e36c647f4.tar.bz2 | |
merge from master
From: Patrick Boettcher <pb@linuxtv.org>
merge from master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/vp702x-fe.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/Kconfig b/linux/drivers/media/dvb/bt8xx/Kconfig index 2337b4171..376ca48f1 100644 --- a/linux/drivers/media/dvb/bt8xx/Kconfig +++ b/linux/drivers/media/dvb/bt8xx/Kconfig @@ -7,6 +7,7 @@ config DVB_BT8XX select DVB_CX24110 select DVB_OR51211 select DVB_LGDT330X + select FW_LOADER help Support for PCI cards based on the Bt8xx PCI bridge. Examples are the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards, diff --git a/linux/drivers/media/dvb/dvb-usb/vp702x-fe.c b/linux/drivers/media/dvb/dvb-usb/vp702x-fe.c index b6d95e1c9..2a89f8c5d 100644 --- a/linux/drivers/media/dvb/dvb-usb/vp702x-fe.c +++ b/linux/drivers/media/dvb/dvb-usb/vp702x-fe.c @@ -147,8 +147,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe, cmd[4] = (sr >> 4) & 0xff; cmd[5] = (sr << 4) & 0xf0; - deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %Lu (%Lx)\n", - fep->frequency,freq,freq, fep->u.qpsk.symbol_rate, sr, sr); + deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n", + fep->frequency,freq,freq, fep->u.qpsk.symbol_rate, + (unsigned long) sr, (unsigned long) sr); /* if (fep->inversion == INVERSION_ON) cmd[6] |= 0x80; */ |