diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:14:11 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:14:11 -0400 |
| commit | c9477f38cba225870862fd9e08868ae3d4abdfe0 (patch) | |
| tree | 01c7575a1e8e3197d072890f48944f1232a885c6 /arch/arm/plat-samsung/Makefile | |
| parent | c37b25046289e857918d25fd96aa441ea7929ad5 (diff) | |
| parent | 2520123382e97271e932377c83bca010c265be55 (diff) | |
Merge branch 'next-samsung-board' into next-samsung-devel-2
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 853764ba8cc5..3de756da5eaa 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
| @@ -11,7 +11,7 @@ obj- := | |||
| 11 | 11 | ||
| 12 | # Objects we always build independent of SoC choice | 12 | # Objects we always build independent of SoC choice |
| 13 | 13 | ||
| 14 | obj-y += init.o | 14 | obj-y += init.o cpu.o |
| 15 | obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o | 15 | obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o |
| 16 | obj-y += clock.o | 16 | obj-y += clock.o |
| 17 | obj-y += pwm-clock.o | 17 | obj-y += pwm-clock.o |