diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:11 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:11 -0400 |
| commit | 32457942b90aabb9242b450f02d18d9c8d982916 (patch) | |
| tree | 6472b77016f83f2ada7a7e2ca83a9803f313f1a8 /arch/arm/plat-s3c24xx/Makefile | |
| parent | 6071399674e813d797d9f458ec8913b86c85398e (diff) | |
| parent | f64bea4318a73e833d0a9b8400cc0f6cee957da3 (diff) | |
ARM: Merge for-2635/fb-updates1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-s3c24xx/Makefile')
| -rw-r--r-- | arch/arm/plat-s3c24xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile index c2237c41141f..44aea8868f89 100644 --- a/arch/arm/plat-s3c24xx/Makefile +++ b/arch/arm/plat-s3c24xx/Makefile | |||
| @@ -30,6 +30,7 @@ obj-$(CONFIG_PM) += pm.o | |||
| 30 | obj-$(CONFIG_PM) += irq-pm.o | 30 | obj-$(CONFIG_PM) += irq-pm.o |
| 31 | obj-$(CONFIG_PM) += sleep.o | 31 | obj-$(CONFIG_PM) += sleep.o |
| 32 | obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o | 32 | obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o |
| 33 | obj-$(CONFIG_S3C2443_CLOCK) += s3c2443-clock.o | ||
| 33 | obj-$(CONFIG_S3C2410_DMA) += dma.o | 34 | obj-$(CONFIG_S3C2410_DMA) += dma.o |
| 34 | obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o | 35 | obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o |
| 35 | obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o | 36 | obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o |