git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
compressed
/
misc.c
diff --git
a/arch/arm/boot/compressed/misc.c
b/arch/arm/boot/compressed/misc.c
index
d32bc71
..
d2b2ef4
100644
(file)
--- 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);
#else
static void putstr(const char *ptr);
+extern void error(char *x);
#include <mach/uncompress.h>
#include <mach/uncompress.h>