3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c
index ff992aa..71d8d6b 100644
--- a/arch/arm/cpu/arm720t/cpu.c
+++ b/arch/arm/cpu/arm720t/cpu.c
@@ -36,7 +36,7 @@
 #include <asm/hardware.h>
 #include <asm/system.h>
 
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_IMPA7)
 static void cache_flush(void);
 #endif
 
@@ -50,7 +50,7 @@ int cleanup_before_linux (void)
 	 * and we set the CPU-speed to 73 MHz - see start.S for details
 	 */
 
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_IMPA7)
 	disable_interrupts ();
 
 	/* turn off I-cache */
@@ -74,7 +74,7 @@ int cleanup_before_linux (void)
 	return 0;
 }
 
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_IMPA7)
 /* flush I/D-cache */
 static void cache_flush (void)
 {
diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index fa9c5a2..3cebf11 100644
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -149,7 +149,7 @@ int timer_init (void)
 
 	/* set timer 2 counter */
 	lastdec = TIMER_LOAD_VAL;
-#elif defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#elif defined(CONFIG_IMPA7)
 	/* disable all interrupts */
 	IO_INTMR1 = 0;
 
@@ -207,7 +207,7 @@ int timer_init (void)
  */
 
 
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_NETARM) || defined(CONFIG_ARMADILLO) || defined(CONFIG_LPC2292)
+#if defined(CONFIG_IMPA7) || defined(CONFIG_NETARM) || defined(CONFIG_LPC2292)
 
 ulong get_timer (ulong base)
 {
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index e9a094f..f2320ee 100644
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -272,7 +272,7 @@ _dynsym_start_ofs:
  *************************************************************************
  */
 
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_IMPA7)
 
 /* Interrupt-Controller base addresses */
 INTMR1:		.word	0x80000280 @ 32 bit size
@@ -301,7 +301,7 @@ MEMMAP_ADR:	.word	MEMMAP
 #endif
 
 cpu_init_crit:
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_IMPA7)
 
 	/*
 	 * mask all IRQs by clearing all bits in the INTMRs
@@ -634,7 +634,7 @@ fiq:
 
 #endif
 
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_IMPA7)
 	.align	5
 .globl reset_cpu
 reset_cpu: