summaryrefslogtreecommitdiff
path: root/arch/arm/mach-rpc/include/mach/uncompress.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 17:23:46 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 17:23:46 +0000
commit74511020dde10252f8b8e648690d99dba721de14 (patch)
tree04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/arm/mach-rpc/include/mach/uncompress.h
parent69266866a5790080d7fe80094b28d670ff8aa765 (diff)
parent3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff)
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'arch/arm/mach-rpc/include/mach/uncompress.h')
-rw-r--r--arch/arm/mach-rpc/include/mach/uncompress.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h
index d5862368c4f2..8c9e2c7161c6 100644
--- a/arch/arm/mach-rpc/include/mach/uncompress.h
+++ b/arch/arm/mach-rpc/include/mach/uncompress.h
@@ -109,8 +109,6 @@ static inline void flush(void)
{
}
-static void error(char *x);
-
/*
* Setup for decompression
*/