diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 15:15:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 15:15:31 -0800 |
| commit | 9f04012c58a32756bbbd0239c4144e835048aa4d (patch) | |
| tree | e5423a1941338b9dd17a82b370cc6c252e0ae1f1 /arch/arm/boot/compressed/misc.c | |
| parent | 329f7dba5f7dc3bc9a30ad00cf373d2e83115aa1 (diff) | |
| parent | 72274c9e24d58d09489d37e732545e52395da270 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/boot/compressed/misc.c')
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 50f13eec6cd..5ab94584bae 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -283,8 +283,14 @@ void flush_window(void) putstr("."); } +#ifndef arch_error +#define arch_error(x) +#endif + static void error(char *x) { + arch_error(x); + putstr("\n\n"); putstr(x); putstr("\n\n -- System halted"); |