[MIPS] Remove always true ifdef conditions.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 0 insertions, 12 deletions

diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index 5e443bba5662..61888ff72c87 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -97,7 +97,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
         mdesc[1].base = 0x00001000;
         mdesc[1].size = 0x000ef000;
 
-#ifdef CONFIG_MIPS_MALTA
         /*
          * The area 0x000f0000-0x000fffff is allocated for BIOS memory by the
          * south bridge and PCI access always forwarded to the ISA Bus and
@@ -108,11 +107,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
         mdesc[2].type = yamon_dontuse;
         mdesc[2].base = 0x000f0000;
         mdesc[2].size = 0x00010000;
-#else
-        mdesc[2].type = yamon_prom;
-        mdesc[2].base = 0x000f0000;
-        mdesc[2].size = 0x00010000;
-#endif
 
         mdesc[3].type = yamon_dontuse;
         mdesc[3].base = 0x00100000;
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c
index ea932b843962..42dee4da37ba 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mips-boards/generic/reset.c
@@ -52,7 +52,5 @@ void mips_reboot_setup(void)
 {
         _machine_restart = mips_machine_restart;
         _machine_halt = mips_machine_halt;
-#ifdef CONFIG_MIPS_MALTA
         pm_power_off = mips_machine_halt;
-#endif
 }
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 @@
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 
-#ifdef CONFIG_MIPS_MALTA
 #include <asm/mips-boards/maltaint.h>
-#endif
 
 unsigned long cpu_khz;
 
@@ -70,7 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void)
         unsigned int prid = read_c0_prid() & 0xffff00;
         unsigned int count;
 
-#ifdef CONFIG_MIPS_MALTA
         unsigned long flags;
         unsigned int start;
 
@@ -91,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void)
 
         /* restore interrupts */
         local_irq_restore(flags);
-#endif
 
         mips_hpt_frequency = count;
         if ((prid != (PRID_COMP_MIPS | PRID_IMP_20KC)) &&