diff options
author | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/media/dvb/dvb-usb/vp7045-fe.c | |
parent | Input: add the fn key to hid-debug.h (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.gz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.xz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.zip |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp7045-fe.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045-fe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c index 2746edfeccba..83f1de1e7e57 100644 --- a/drivers/media/dvb/dvb-usb/vp7045-fe.c +++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c @@ -58,7 +58,7 @@ static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber) struct vp7045_fe_state *state = fe->demodulator_priv; *ber = (vp7045_read_reg(state->d, 0x0D) << 16) | (vp7045_read_reg(state->d, 0x0E) << 8) | - vp7045_read_reg(state->d, 0x0F); + vp7045_read_reg(state->d, 0x0F); return 0; } |