aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 00:18:56 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-28 00:18:56 +0000
commita46117836e23f97cf4660b0ebf8404ad151fb63d (patch)
tree2739f48d6ba3a7a8820f54929778ab69db314dba /arch/arm/mach-exynos/Makefile
parentbd4b9ba4cf9338932a065cd752fb5f28b26e4e39 (diff)
parent155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (diff)
Merge branch 'samsung/driver' into next/drivers
* samsung/driver: ARM: EXYNOS: Modified files for SPI consolidation work ARM: S5P64X0: Enable SDHCI support ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names ARM: S5P64X0: Add HSMMC setup for host Controller
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
-rw-r--r--arch/arm/mach-exynos/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index a0959ad0407..db527ab4759 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -61,3 +61,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o
obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o
+obj-$(CONFIG_EXYNOS4_SETUP_SPI) += setup-spi.o