diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:52 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:52 +0100 |
commit | 119c4b1257e44d9ec981465ccb80aba427a96dda (patch) | |
tree | 059647211002acf6bd0a6137b310d212b5653f7a /arch/arm/mach-s5pc100/Makefile | |
parent | 3d34a0d80ab51b6838c08c22e7f47aec408eb837 (diff) | |
parent | d472d1a1c82ade81d2854db2ff4c9694ed66612e (diff) | |
download | linux-119c4b1257e44d9ec981465ccb80aba427a96dda.tar.gz |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s5pc100/Makefile')
-rw-r--r-- | arch/arm/mach-s5pc100/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile index 373bc546eae8..543f3de5131e 100644 --- a/arch/arm/mach-s5pc100/Makefile +++ b/arch/arm/mach-s5pc100/Makefile @@ -11,14 +11,24 @@ obj- := # Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o gpiolib.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpiolib.o irq-gpio.o obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o +obj-$(CONFIG_CPU_S5PC100) += dma.o # Helper and device support obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o -obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o +obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o +obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o + +# device support +obj-y += dev-audio.o +obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o # machine support + obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o + +# device support +obj-y += dev-audio.o |