Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22b0119e authored by Roman Zippel's avatar Roman Zippel Committed by Mauro Carvalho Chehab
Browse files

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: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 29e031d5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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;