summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-w90x900
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-05 10:26:06 -0800
committerOlof Johansson <olof@lixom.net>2013-02-05 10:26:20 -0800
commitb28eaacfbbccef527834d48f118919b39ec8d213 (patch)
treeacaa997a97f2f739d11c0030b204041b21ce7107 /arch/arm/mach-w90x900
parent0a046de1d103ebb02f64c61eb30800e39e9c8ec9 (diff)
parent1ff5f55a8c7b011f818434923a93afc48de0b2ee (diff)
downloadop-kernel-dev-b28eaacfbbccef527834d48f118919b39ec8d213.zip
op-kernel-dev-b28eaacfbbccef527834d48f118919b39ec8d213.tar.gz
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-w90x900')
-rw-r--r--arch/arm/mach-w90x900/include/mach/uncompress.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h
index 0313021..4b7c324 100644
--- a/arch/arm/mach-w90x900/include/mach/uncompress.h
+++ b/arch/arm/mach-w90x900/include/mach/uncompress.h
@@ -24,8 +24,6 @@
#include <mach/map.h>
#include <linux/serial_reg.h>
-#define arch_decomp_wdog()
-
#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
static volatile u32 * const uart_base = (u32 *)UART0_PA;
OpenPOWER on IntegriCloud