diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-24 08:35:23 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-24 08:35:23 -0200 |
| commit | 18efb709ad3602aebb032ef3f23aba5d45a44d38 (patch) | |
| tree | bbcd724ecf5864b723f46e7463a8a0c310fa79d4 /linux/drivers/media/video/cx18/cx18-av-core.c | |
| parent | 31674e74f8cbf0314f12262b769aa8254e49805f (diff) | |
| parent | c73a2ef55808dad64c72bdc00490c63333b8351c (diff) | |
| download | mediapointer-dvb-s2-18efb709ad3602aebb032ef3f23aba5d45a44d38.tar.gz mediapointer-dvb-s2-18efb709ad3602aebb032ef3f23aba5d45a44d38.tar.bz2 | |
merge http://linuxtv.org/hg/~mkrufky/windham
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) { |