summaryrefslogtreecommitdiff
path: root/arch/arm/mach-rpc/include/mach/uncompress.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-31 08:55:14 +0400
committerDave Airlie <airlied@redhat.com>2010-03-31 08:55:14 +0400
commit3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch)
tree15671ed8bd3597d2efe13aa57b755c66014acb57 /arch/arm/mach-rpc/include/mach/uncompress.h
parentc414a117c6094c3f86b533f97beaf45ef9075f03 (diff)
parent220bf991b0366cc50a94feede3d7341fa5710ee4 (diff)
downloadlinux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.xz
Merge branch 'v2.6.34-rc2' into drm-linus
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
*/