diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-19 18:01:26 (GMT) |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-19 18:01:26 (GMT) |
commit | ab5a4e6381d27a6554e6833383e536773e3a6ec1 (patch) | |
tree | 88cfa18c33229cea756c2308607c26c1f19e9203 /arch/arm/mach-exynos/Makefile | |
parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
parent | 5ddfa8428b9f21453b1160846143e0b50d51b27c (diff) | |
download | linux-fsl-qoriq-ab5a4e6381d27a6554e6833383e536773e3a6ec1.tar.xz |
Merge branch 'next/devel-samsung' into next/devel-samsung-2
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
-rw-r--r-- | arch/arm/mach-exynos/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 8631840..440a637 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -50,10 +50,11 @@ obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o obj-y += dev-uart.o obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o -obj-$(CONFIG_EXYNOS4_DEV_SYSMMU) += dev-sysmmu.o obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o -obj-$(CONFIG_EXYNOS4_DEV_DMA) += dma.o +obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o +obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o +obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o @@ -68,4 +69,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 +obj-$(CONFIG_EXYNOS_SETUP_SPI) += setup-spi.o |