diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 18:59:54 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 18:59:54 +0900 |
| commit | c6906c3e29a4a28660f70421935c91cf6b8ab1e1 (patch) | |
| tree | 40d97bdc21b95788ab24a4824c769b9dbe9b602b /arch/arm/mach-s5pv310/Makefile | |
| parent | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (diff) | |
| parent | 8267e2e0fba74a944f9d0c9afd7779eb7272f5e7 (diff) | |
| download | linux-stable-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.tar.gz linux-stable-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.tar.bz2 linux-stable-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.zip | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv310/Makefile')
| -rw-r--r-- | arch/arm/mach-s5pv310/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/Makefile b/arch/arm/mach-s5pv310/Makefile index e01a4d050a4c..651f1933e228 100644 --- a/arch/arm/mach-s5pv310/Makefile +++ b/arch/arm/mach-s5pv310/Makefile @@ -14,6 +14,7 @@ obj- := obj-$(CONFIG_CPU_S5PV310) += cpu.o init.o clock.o irq-combiner.o obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o gpiolib.o irq-eint.o dma.o +obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o |