diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-30 16:43:18 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-30 16:43:18 +0800 |
| commit | c1c52e38d35ff01f08b55377126c979a08fbdb1d (patch) | |
| tree | 2c4b7c384ccfc8834693ef392d30b10fc3899237 /cpu/arm720t/cpu.c | |
| parent | fdef388758506765d4d6a7155c8f1584c63ff581 (diff) | |
| parent | f8db84f132b1e335f20f96138a1f09ed97b08664 (diff) | |
Merge branch 'master' into hpc2
Diffstat (limited to 'cpu/arm720t/cpu.c')
| -rw-r--r-- | cpu/arm720t/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/arm720t/cpu.c b/cpu/arm720t/cpu.c index a5b6de76055..60c1aa90b6b 100644 --- a/cpu/arm720t/cpu.c +++ b/cpu/arm720t/cpu.c @@ -73,7 +73,7 @@ int cleanup_before_linux (void) /* go to high speed */ IO_SYSCON3 = (IO_SYSCON3 & ~CLKCTL) | CLKCTL_73; #endif -#elif defined(CONFIG_NETARM) || defined(CONFIG_S3C4510B) +#elif defined(CONFIG_NETARM) || defined(CONFIG_S3C4510B) || defined(CONFIG_LPC2292) disable_interrupts (); /* Nothing more needed */ #elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR) @@ -252,6 +252,7 @@ int dcache_status (void) void icache_enable (void) { } +#elif defined(CONFIG_LPC2292) /* just to satisfy the compiler */ #else #error No icache/dcache enable/disable functions defined for this CPU type #endif |