35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From ef1c2096fcf390f2f6a6a835d9d26105e82abda5 Mon Sep 17 00:00:00 2001
|
|
From: Rob Herring <rob.herring@calxeda.com>
|
|
Date: Wed, 15 Aug 2012 16:28:36 +0100
|
|
Subject: [PATCH] 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>
|
|
---
|
|
arch/arm/boot/compressed/decompress.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
|
|
index f41b38c..9deb56a 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
|
|
--
|
|
1.8.0
|
|
|