diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 19:18:56 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 19:18:56 -0500 |
| commit | a46117836e23f97cf4660b0ebf8404ad151fb63d (patch) | |
| tree | 2739f48d6ba3a7a8820f54929778ab69db314dba /arch/arm/mach-exynos/Makefile | |
| parent | bd4b9ba4cf9338932a065cd752fb5f28b26e4e39 (diff) | |
| parent | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (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/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index a0959ad04077..db527ab4759c 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 | |||
| 61 | obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o | 61 | obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o |
| 62 | obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | 62 | obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
| 63 | obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o | 63 | obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o |
| 64 | obj-$(CONFIG_EXYNOS4_SETUP_SPI) += setup-spi.o | ||