diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
| commit | 8dd9117cc7a021ced1c5cf177e2d44dd92b88617 (patch) | |
| tree | cad990f58f9ec6d400226dda86718fc10781416e /arch/arm/boot/compressed/decompress.c | |
| parent | e1000e: add device IDs for i218 (diff) | |
| parent | Fix staging driver use of VM_RESERVED (diff) | |
| download | linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.tar.xz linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/compressed/decompress.c')
| -rw-r--r-- | arch/arm/boot/compressed/decompress.c | 3 |
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 |