From: Arnd Bergmann Date: Wed, 28 Dec 2011 00:18:10 +0000 (+0000) Subject: Merge branch 'samsung/cleanup' into next/drivers X-Git-Tag: v3.3-rc1~138^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd4b9ba4cf9338932a065cd752fb5f28b26e4e39;p=karo-tx-linux.git Merge branch 'samsung/cleanup' into next/drivers Dependency for the samsung/drivers branch Conflicts: arch/arm/mach-exynos/Makefile Signed-off-by: Arnd Bergmann --- bd4b9ba4cf9338932a065cd752fb5f28b26e4e39 diff --cc arch/arm/mach-exynos/Kconfig index 5ca0bddf65fa,0afcc3b0f870..0da2ced1ae48 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@@ -182,9 -182,9 +187,10 @@@ config MACH_SMDKV31 select SAMSUNG_DEV_BACKLIGHT select EXYNOS4_DEV_AHCI select SAMSUNG_DEV_KEYPAD + select EXYNOS4_DEV_DMA select EXYNOS4_DEV_PD select SAMSUNG_DEV_PWM + select EXYNOS4_DEV_USB_OHCI select EXYNOS4_DEV_SYSMMU select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_I2C1 @@@ -293,8 -296,8 +302,9 @@@ config MACH_ORIGE select S5P_DEV_USB_EHCI select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_PWM + select EXYNOS4_DEV_DMA select EXYNOS4_DEV_PD + select EXYNOS4_DEV_USB_OHCI select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY diff --cc arch/arm/mach-exynos/Makefile index f5f3b7994923,57e529620804..a0959ad04077 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@@ -44,7 -46,7 +46,8 @@@ obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev- obj-$(CONFIG_EXYNOS4_DEV_PD) += dev-pd.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_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o obj-$(CONFIG_EXYNOS4_SETUP_FIMD0) += setup-fimd0.o