diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:14:11 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:14:11 +0900 |
commit | c9477f38cba225870862fd9e08868ae3d4abdfe0 (patch) | |
tree | 01c7575a1e8e3197d072890f48944f1232a885c6 /arch/arm/plat-samsung/Makefile | |
parent | c37b25046289e857918d25fd96aa441ea7929ad5 (diff) | |
parent | 2520123382e97271e932377c83bca010c265be55 (diff) | |
download | op-kernel-dev-c9477f38cba225870862fd9e08868ae3d4abdfe0.zip op-kernel-dev-c9477f38cba225870862fd9e08868ae3d4abdfe0.tar.gz |
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 853764b..3de756d 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -11,7 +11,7 @@ obj- := # Objects we always build independent of SoC choice -obj-y += init.o +obj-y += init.o cpu.o obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) += time.o obj-y += clock.o obj-y += pwm-clock.o |