diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-14 05:22:46 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-14 05:22:46 -0400 |
| commit | f1cb86ece24fbdf99d0cd544a2f0076f2d01eaa5 (patch) | |
| tree | 1746550efeb3faaab847fe561fd2e1ece89af688 /arch/arm/mach-s3c24xx/Makefile | |
| parent | a024fa1313d57264ad88a7a4f2f96f9472986712 (diff) | |
| parent | c4bec603831d2f792a73c2422118f07000c15d5d (diff) | |
Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsung
Diffstat (limited to 'arch/arm/mach-s3c24xx/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c24xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 3518fe812d5f..d0f3a92f9e4a 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile | |||
| @@ -91,5 +91,6 @@ obj-$(CONFIG_MACH_OSIRIS_DVS) += mach-osiris-dvs.o | |||
| 91 | # device setup | 91 | # device setup |
| 92 | 92 | ||
| 93 | obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | 93 | obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
| 94 | obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o | ||
| 94 | obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o | 95 | obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o |
| 95 | obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o | 96 | obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o |