summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0
diff options
context:
space:
mode:
authorOlof Johansson2013-02-05 19:26:06 +0100
committerOlof Johansson2013-02-05 19:26:20 +0100
commitb28eaacfbbccef527834d48f118919b39ec8d213 (patch)
treeacaa997a97f2f739d11c0030b204041b21ce7107 /arch/arm/mach-mv78xx0
parentMerge tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/... (diff)
parentARM: samsung: remove unused arch_decomp_wdog() code (diff)
downloadkernel-qcow2-linux-b28eaacfbbccef527834d48f118919b39ec8d213.tar.gz
kernel-qcow2-linux-b28eaacfbbccef527834d48f118919b39ec8d213.tar.xz
kernel-qcow2-linux-b28eaacfbbccef527834d48f118919b39ec8d213.zip
Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
From Shawn Guo: The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which are unused on ARM architecure. Samsung has some code setting up wdog in arch_decomp_wdog(). But since CONFIG_S3C_BOOT_WATCHDOG is defined nowhere, it will not run. Otherwise, system can not boot at all when wdog is set up but no one pats it. * tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: samsung: remove unused arch_decomp_wdog() code ARM: remove unused arch_decomp_wdog() ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r--arch/arm/mach-mv78xx0/include/mach/uncompress.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/uncompress.h b/arch/arm/mach-mv78xx0/include/mach/uncompress.h
index 365264298e79..6a761c44a296 100644
--- a/arch/arm/mach-mv78xx0/include/mach/uncompress.h
+++ b/arch/arm/mach-mv78xx0/include/mach/uncompress.h
@@ -44,4 +44,3 @@ static void flush(void)
* nothing to do
*/
#define arch_decomp_setup()
-#define arch_decomp_wdog()