diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 23:17:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 23:17:52 +0100 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s3c64xx/Makefile | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index 9d1006938f5c..48d3dfac8dd7 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -35,6 +35,8 @@ obj-$(CONFIG_S3C64XX_DMA) += dma.o obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o +obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o +obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |