diff options
author | David S. Miller <davem@davemloft.net> | 2010-03-22 20:05:26 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-22 20:05:26 -0700 |
commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
tree | e8a48e3ad9e0448c690268175e555fa651983546 /arch/arm/boot/compressed/misc.c | |
parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/boot/compressed/misc.c')
-rw-r--r-- | arch/arm/boot/compressed/misc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index d32bc71c1f7..d2b2ef41cd4 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -33,6 +33,7 @@ unsigned int __machine_arch_type; #else static void putstr(const char *ptr); +extern void error(char *x); #include <mach/uncompress.h> |