diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:40:24 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:40:24 -0400 |
| commit | 45c8fa878475b16467109cf6534af03b27e28d10 (patch) | |
| tree | a7c66c65dbc38774dcbba0d2965b1f851fcc1578 /arch/arm/mach-s5pc100/Makefile | |
| parent | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (diff) | |
| parent | ef2f07d31c6b890e0cc3966d4a27fa1d49b740f5 (diff) | |
ARM: Merge for-2635-4/spi-devs
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5pc100/Makefile')
| -rw-r--r-- | arch/arm/mach-s5pc100/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile index 26f6f30cc7e2..e1081a9b19c8 100644 --- a/arch/arm/mach-s5pc100/Makefile +++ b/arch/arm/mach-s5pc100/Makefile | |||
| @@ -21,6 +21,10 @@ obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o | |||
| 21 | obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o | 21 | obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o |
| 22 | obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | 22 | obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
| 23 | 23 | ||
| 24 | # device support | ||
| 25 | obj-y += dev-audio.o | ||
| 26 | obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o | ||
| 27 | |||
| 24 | # machine support | 28 | # machine support |
| 25 | 29 | ||
| 26 | obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o | 30 | obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o |