diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 12:52:50 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 12:52:50 +0000 |
| commit | 2aab8237faf0bac5c8f6b3ab69b73b78c0488244 (patch) | |
| tree | 2f01ac7da4a715e5d4bf4f1e11310aa367fd3687 /linux/drivers/media/dvb/frontends/drx397xD.c | |
| parent | b8cd0ea01c96add07515f70e3bf4ceb549032ab8 (diff) | |
| download | mediapointer-dvb-s2-2aab8237faf0bac5c8f6b3ab69b73b78c0488244.tar.gz mediapointer-dvb-s2-2aab8237faf0bac5c8f6b3ab69b73b78c0488244.tar.bz2 | |
2.6.25-rc5-mm1 specifc div64_u64 fixes
From: Roman Zippel <zippel@linux-m68k.org>
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 'linux/drivers/media/dvb/frontends/drx397xD.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/drx397xD.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/drx397xD.c b/linux/drivers/media/dvb/frontends/drx397xD.c index 319a6b541..f0a250512 100644 --- a/linux/drivers/media/dvb/frontends/drx397xD.c +++ b/linux/drivers/media/dvb/frontends/drx397xD.c @@ -1062,13 +1062,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; |