diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-exynos/clock-exynos4212.c | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos4212.c')
| -rw-r--r-- | arch/arm/mach-exynos/clock-exynos4212.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4212.c b/arch/arm/mach-exynos/clock-exynos4212.c index 77d5decb34fd..26a668b0d101 100644 --- a/arch/arm/mach-exynos/clock-exynos4212.c +++ b/arch/arm/mach-exynos/clock-exynos4212.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <plat/pll.h> | 23 | #include <plat/pll.h> |
| 24 | #include <plat/s5p-clock.h> | 24 | #include <plat/s5p-clock.h> |
| 25 | #include <plat/clock-clksrc.h> | 25 | #include <plat/clock-clksrc.h> |
| 26 | #include <plat/exynos4.h> | ||
| 27 | #include <plat/pm.h> | 26 | #include <plat/pm.h> |
| 28 | 27 | ||
| 29 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| @@ -31,6 +30,8 @@ | |||
| 31 | #include <mach/regs-clock.h> | 30 | #include <mach/regs-clock.h> |
| 32 | #include <mach/exynos4-clock.h> | 31 | #include <mach/exynos4-clock.h> |
| 33 | 32 | ||
| 33 | #include "common.h" | ||
| 34 | |||
| 34 | static struct sleep_save exynos4212_clock_save[] = { | 35 | static struct sleep_save exynos4212_clock_save[] = { |
| 35 | SAVE_ITEM(S5P_CLKSRC_IMAGE), | 36 | SAVE_ITEM(S5P_CLKSRC_IMAGE), |
| 36 | SAVE_ITEM(S5P_CLKDIV_IMAGE), | 37 | SAVE_ITEM(S5P_CLKDIV_IMAGE), |