diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:34 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:34 -0400 |
commit | eda49eeebf263f3a34f6968959fc2e4825b42beb (patch) | |
tree | d96fdbe15fdb965f244a3a251b905f85fb0494ca /arch/mips/mips-boards/generic/time.c | |
parent | d5deda6fa1ca434d36c2daffb63127e92c6470f5 (diff) |
[MIPS] Remove always true ifdef conditions.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/generic/time.c')
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 744dbfc6e484..0b97d47691fc 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -42,9 +42,7 @@ | |||
42 | #include <asm/mips-boards/generic.h> | 42 | #include <asm/mips-boards/generic.h> |
43 | #include <asm/mips-boards/prom.h> | 43 | #include <asm/mips-boards/prom.h> |
44 | 44 | ||
45 | #ifdef CONFIG_MIPS_MALTA | ||
46 | #include <asm/mips-boards/maltaint.h> | 45 | #include <asm/mips-boards/maltaint.h> |
47 | #endif | ||
48 | 46 | ||
49 | unsigned long cpu_khz; | 47 | unsigned long cpu_khz; |
50 | 48 | ||
@@ -70,7 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void) | |||
70 | unsigned int prid = read_c0_prid() & 0xffff00; | 68 | unsigned int prid = read_c0_prid() & 0xffff00; |
71 | unsigned int count; | 69 | unsigned int count; |
72 | 70 | ||
73 | #ifdef CONFIG_MIPS_MALTA | ||
74 | unsigned long flags; | 71 | unsigned long flags; |
75 | unsigned int start; | 72 | unsigned int start; |
76 | 73 | ||
@@ -91,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void) | |||
91 | 88 | ||
92 | /* restore interrupts */ | 89 | /* restore interrupts */ |
93 | local_irq_restore(flags); | 90 | local_irq_restore(flags); |
94 | #endif | ||
95 | 91 | ||
96 | mips_hpt_frequency = count; | 92 | mips_hpt_frequency = count; |
97 | if ((prid != (PRID_COMP_MIPS | PRID_IMP_20KC)) && | 93 | if ((prid != (PRID_COMP_MIPS | PRID_IMP_20KC)) && |