diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/mips/vr41xx/common | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/mips/vr41xx/common')
| -rw-r--r-- | arch/mips/vr41xx/common/bcu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/vr41xx/common/bcu.c b/arch/mips/vr41xx/common/bcu.c index de0c1b35f11c..ff272b2e8395 100644 --- a/arch/mips/vr41xx/common/bcu.c +++ b/arch/mips/vr41xx/common/bcu.c | |||
| @@ -183,11 +183,11 @@ static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pc | |||
| 183 | switch (current_cpu_data.cputype) { | 183 | switch (current_cpu_data.cputype) { |
| 184 | case CPU_VR4111: | 184 | case CPU_VR4111: |
| 185 | if (!(clkspeed & DIV2B)) | 185 | if (!(clkspeed & DIV2B)) |
| 186 | tclock = pclock / 2; | 186 | tclock = pclock / 2; |
| 187 | else if (!(clkspeed & DIV3B)) | 187 | else if (!(clkspeed & DIV3B)) |
| 188 | tclock = pclock / 3; | 188 | tclock = pclock / 3; |
| 189 | else if (!(clkspeed & DIV4B)) | 189 | else if (!(clkspeed & DIV4B)) |
| 190 | tclock = pclock / 4; | 190 | tclock = pclock / 4; |
| 191 | break; | 191 | break; |
| 192 | case CPU_VR4121: | 192 | case CPU_VR4121: |
| 193 | tclock = pclock / DIVT(clkspeed); | 193 | tclock = pclock / DIVT(clkspeed); |