diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2008-04-30 09:52:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 08:09:13 -0300 |
| commit | 22b0119e09d6e7d671535c61de27753a5e1a0a63 (patch) | |
| tree | 7c11fb9cafdef7c907c700e2604f38569613d88c /drivers/media/dvb | |
| parent | 29e031d5b09ae60d0ecdb6a1d869d591d63e893a (diff) | |
| download | blackbird-op-linux-22b0119e09d6e7d671535c61de27753a5e1a0a63.tar.gz blackbird-op-linux-22b0119e09d6e7d671535c61de27753a5e1a0a63.zip | |
V4L/DVB (7812): 2.6.25-rc5-mm1 specifc div64_u64 fixes
Rename a few more div64_u64 which are only in -mm.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb')
| -rw-r--r-- | drivers/media/dvb/frontends/drx397xD.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index af4354662124..d71cce93d08e 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c @@ -1026,13 +1026,13 @@ static int drx_tune(struct drx397xD_state *s, { /* Configure bandwidth specific factor */ - ebx = div64_64(((u64) (s->f_osc) << 21) + (ebx >> 1), + ebx = div64_u64(((u64) (s->f_osc) << 21) + (ebx >> 1), (u64)ebx) - 0x800000; EXIT_RC(WR16(s, 0x0c50010, ebx & 0xffff)); EXIT_RC(WR16(s, 0x0c50011, ebx >> 16)); /* drx397xD oscillator calibration */ - ebx = div64_64(((u64) (s->config.f_if + df_tuner) << 28) + + ebx = div64_u64(((u64) (s->config.f_if + df_tuner) << 28) + (s->f_osc >> 1), (u64)s->f_osc); } ebx &= 0xfffffff; |
