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 'linux-next' of git://git.infradead.org/ubifs-2.6
[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
393c816
..
9e6e512
100644
(file)
--- a/
arch/arm/boot/compressed/misc.c
+++ b/
arch/arm/boot/compressed/misc.c
@@
-18,7
+18,10
@@
unsigned int __machine_arch_type;
unsigned int __machine_arch_type;
-#include <linux/string.h>
+#include <linux/compiler.h> /* for inline */
+#include <linux/types.h> /* for size_t */
+#include <linux/stddef.h> /* for NULL */
+#include <asm/string.h>
#ifdef STANDALONE_DEBUG
#define putstr printf
#ifdef STANDALONE_DEBUG
#define putstr printf