diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 20:52:33 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 10:07:48 +0000 |
| commit | bde755679a3ba5af0d16231f8532e8373c5e2ecc (patch) | |
| tree | 782fa01306ada3e084bd3c47ea1af378b97c0e16 /arch/arm/mach-exynos/Makefile | |
| parent | 62a16d025c683fe9e1eada7683095013b96ce9d1 (diff) | |
| parent | 44b2cef5ae6da48523fa634230ca66107110a7dd (diff) | |
| download | linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.gz linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.bz2 linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.zip | |
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c
The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
| -rw-r--r-- | arch/arm/mach-exynos/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 5fc202cdfdb6..995e7cc02bec 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -12,7 +12,8 @@ obj- := # Core -obj-$(CONFIG_ARCH_EXYNOS4) += common.o clock.o +obj-$(CONFIG_ARCH_EXYNOS) += common.o +obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o |