diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-24 08:31:04 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-24 08:31:04 -0200 |
| commit | c73a2ef55808dad64c72bdc00490c63333b8351c (patch) | |
| tree | ecd081607cf8afbd93d3716164fd4eb9cf5531b1 /linux/drivers/media/video/cx18/cx18-av-core.c | |
| parent | b0d6553d68b8a1ffded1620af3daf811d387fa31 (diff) | |
| parent | 752b7bb4231bff537eda1576e55e26ed7a363e38 (diff) | |
| download | mediapointer-dvb-s2-c73a2ef55808dad64c72bdc00490c63333b8351c.tar.gz mediapointer-dvb-s2-c73a2ef55808dad64c72bdc00490c63333b8351c.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-av-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-core.c b/linux/drivers/media/video/cx18/cx18-av-core.c index 518bd701d..40ea6fde6 100644 --- a/linux/drivers/media/video/cx18/cx18-av-core.c +++ b/linux/drivers/media/video/cx18/cx18-av-core.c @@ -4,6 +4,7 @@ * Derived from cx25840-core.c * * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> + * Copyright (C) 2008 Andy Walls <awalls@radix.net> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -80,11 +81,6 @@ u32 cx18_av_read4(struct cx18 *cx, u16 addr) return cx18_read_reg(cx, 0xc40000 + addr); } -u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr) -{ - return cx18_read_reg_noretry(cx, 0xc40000 + addr); -} - int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned and_mask, u8 or_value) { |