summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/compressed/decompress.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-08-15 16:28:36 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-08-25 09:22:30 +0100
commitef1c2096fcf390f2f6a6a835d9d26105e82abda5 (patch)
treeb2faa2aaaf65687c4ae04960784d950ee8acd60a /arch/arm/boot/compressed/decompress.c
parent4a8052d8445a24771905d71d13f917146f9e822c (diff)
downloadblackbird-op-linux-ef1c2096fcf390f2f6a6a835d9d26105e82abda5.tar.gz
blackbird-op-linux-ef1c2096fcf390f2f6a6a835d9d26105e82abda5.zip
ARM: 7492/1: add strstr declaration for decompressors
With the generic unaligned.h, more kernel headers get pulled in including dynamic_debug.h which needs strstr. As it is not really used, we only need a declaration here. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/compressed/decompress.c')
-rw-r--r--arch/arm/boot/compressed/decompress.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index f41b38cafce8..9deb56a702ce 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -32,6 +32,9 @@ extern void error(char *);
# define Tracecv(c,x)
#endif
+/* Not needed, but used in some headers pulled in by decompressors */
+extern char * strstr(const char * s1, const char *s2);
+
#ifdef CONFIG_KERNEL_GZIP
#include "../../../../lib/decompress_inflate.c"
#endif
OpenPOWER on IntegriCloud