diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 03:08:29 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 03:08:29 -0400 |
| commit | 7684f784b08f0b1568567ff5f23cf0f5dff86be5 (patch) | |
| tree | 13ed8e6ccb008cb79f3a6d03cc46c7b2c0b91d5e /arch/arm/mach-s3c2416/Makefile | |
| parent | 05daf079259c7e5393f204503284ee90072cb348 (diff) | |
| parent | 6436b6a7a64f946c5a5f3d8a8c0e6404e2bda8d5 (diff) | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c2416/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c2416/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2416/Makefile b/arch/arm/mach-s3c2416/Makefile index 6c12c7bf40ad..ef038d62ffdb 100644 --- a/arch/arm/mach-s3c2416/Makefile +++ b/arch/arm/mach-s3c2416/Makefile | |||
| @@ -11,7 +11,7 @@ obj- := | |||
| 11 | 11 | ||
| 12 | obj-$(CONFIG_CPU_S3C2416) += s3c2416.o clock.o | 12 | obj-$(CONFIG_CPU_S3C2416) += s3c2416.o clock.o |
| 13 | obj-$(CONFIG_CPU_S3C2416) += irq.o | 13 | obj-$(CONFIG_CPU_S3C2416) += irq.o |
| 14 | 14 | obj-$(CONFIG_S3C2416_PM) += pm.o | |
| 15 | #obj-$(CONFIG_S3C2416_DMA) += dma.o | 15 | #obj-$(CONFIG_S3C2416_DMA) += dma.o |
| 16 | 16 | ||
| 17 | # Machine support | 17 | # Machine support |