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>
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index af43546..d71cce9 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -1026,13 +1026,13 @@
{
/* 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;