Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde75567 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 62a16d02 44b2cef5

arch/arm/mach-exynos/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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