diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:01:00 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:01:00 +0100 |
| commit | a07613a54d700a974f3a4a657da78ef5d097315d (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/mach-exynos/clock.c | |
| parent | Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | Merge branch 'next/cleanup' into samsung/dt (diff) | |
| download | linux-a07613a54d700a974f3a4a657da78ef5d097315d.tar.xz linux-a07613a54d700a974f3a4a657da78ef5d097315d.zip | |
Merge branch 'samsung/dt' into samsung/cleanup
Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile
Pull in previously resolved conflicts:
The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/clock.c')
| -rw-r--r-- | arch/arm/mach-exynos/clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c index 5d8d4831e244..5d5250df33fd 100644 --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@ -21,7 +21,6 @@ #include <plat/pll.h> #include <plat/s5p-clock.h> #include <plat/clock-clksrc.h> -#include <plat/exynos4.h> #include <plat/pm.h> #include <mach/map.h> @@ -29,6 +28,8 @@ #include <mach/sysmmu.h> #include <mach/exynos4-clock.h> +#include "common.h" + static struct sleep_save exynos4_clock_save[] = { SAVE_ITEM(S5P_CLKDIV_LEFTBUS), SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS), |