diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 23:23:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 23:23:34 +0200 |
| commit | 2b3a47d7a0cda3b35d95a4935d502ff5abab2c4d (patch) | |
| tree | fc7ebd87473156d46ca18b49c4da6f963c32318f /arch/arm/mach-s3c24xx/common.c | |
| parent | 28fd837204236cf5b5533525e5b53c5176fa97a3 (diff) | |
| parent | f6361c6b3880063c2248d4e453331e3dc1efbf83 (diff) | |
Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Pull "Samsung cleanup for 3.18" from Kukjin Kim:
- remove unused <mach/memory.h> in exynos
- local <mach/regs-clock.h> for s5pv210
- cleanup boot address calculate for exynos
- remove separate restart code for s3c24xx
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: remove separate restart code
ARM: EXYNOS: Do not calculate boot address twice
ARM: S5PV210: move <mach/regs-clock.h> into mach-s5pv210/
ARM: EXYNOS: remove unused <mach/memory.h>
Diffstat (limited to 'arch/arm/mach-s3c24xx/common.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/common.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index 44fa95df926..bf50328107b 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -51,7 +51,6 @@ #include <plat/devs.h> #include <plat/cpu-freq.h> #include <plat/pwm-core.h> -#include <plat/watchdog-reset.h> #include "common.h" @@ -513,7 +512,6 @@ struct platform_device s3c2443_device_dma = { void __init s3c2410_init_clocks(int xtal) { s3c2410_common_clk_init(NULL, xtal, 0, S3C24XX_VA_CLKPWR); - samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG); } #endif @@ -535,7 +533,6 @@ void __init s3c2416_init_clocks(int xtal) void __init s3c2440_init_clocks(int xtal) { s3c2410_common_clk_init(NULL, xtal, 1, S3C24XX_VA_CLKPWR); - samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG); } #endif @@ -543,7 +540,6 @@ void __init s3c2440_init_clocks(int xtal) void __init s3c2442_init_clocks(int xtal) { s3c2410_common_clk_init(NULL, xtal, 2, S3C24XX_VA_CLKPWR); - samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG); } #endif |