diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 13:26:06 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 13:26:20 -0500 |
| commit | b28eaacfbbccef527834d48f118919b39ec8d213 (patch) | |
| tree | acaa997a97f2f739d11c0030b204041b21ce7107 /arch/arm/mach-ux500/include | |
| parent | 0a046de1d103ebb02f64c61eb30800e39e9c8ec9 (diff) | |
| parent | 1ff5f55a8c7b011f818434923a93afc48de0b2ee (diff) | |
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-ux500/include')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/uncompress.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index d60ecd1753f0..36969d52e53a 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h | |||
| @@ -54,6 +54,4 @@ static inline void arch_decomp_setup(void) | |||
| 54 | ux500_uart_base = (void __iomem *)U8500_UART2_BASE; | 54 | ux500_uart_base = (void __iomem *)U8500_UART2_BASE; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | #define arch_decomp_wdog() /* nothing to do here */ | ||
| 58 | |||
| 59 | #endif /* __ASM_ARCH_UNCOMPRESS_H */ | 57 | #endif /* __ASM_ARCH_UNCOMPRESS_H */ |