diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-30 23:06:46 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-30 23:06:46 (GMT) |
commit | 929d138a3ba776145d2f421c2c4f16d922535090 (patch) | |
tree | cb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/mach-exynos/Makefile | |
parent | d64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff) | |
parent | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff) | |
download | linux-fsl-qoriq-929d138a3ba776145d2f421c2c4f16d922535090.tar.xz |
Merge branch 'late/soc' into devel-late
* late/soc:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
-rw-r--r-- | arch/arm/mach-exynos/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 440a637..9b58024 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_ARCH_EXYNOS4) += pmu.o +obj-$(CONFIG_ARCH_EXYNOS) += pmu.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o |