diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:23:45 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:23:45 -0400 |
| commit | 215ed3236a17b748cf75a2c23f50028c95302a42 (patch) | |
| tree | a1fa16573704a4a1bb646365f5d4c6cd3bb321f9 /arch/arm/mach-s3c2410/Makefile | |
| parent | 0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (diff) | |
| parent | e6d197a6954c8a9ff85727c31ca61fc1da78628a (diff) | |
Merge branch 'next-s3c24xx-cpufreq' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c2410/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c2410/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile index fca02f82711c..2ab5ba4b266f 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile | |||
| @@ -15,6 +15,8 @@ obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o | |||
| 15 | obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o | 15 | obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o |
| 16 | obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o | 16 | obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o |
| 17 | obj-$(CONFIG_S3C2410_GPIO) += gpio.o | 17 | obj-$(CONFIG_S3C2410_GPIO) += gpio.o |
| 18 | obj-$(CONFIG_S3C2410_CPUFREQ) += cpu-freq.o | ||
| 19 | obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o | ||
| 18 | 20 | ||
| 19 | # Machine support | 21 | # Machine support |
| 20 | 22 | ||