Merge branch 'samsung/cleanup' into next/drivers

Dependency for the samsung/drivers branch

Conflicts:
	arch/arm/mach-exynos/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-exynos/Kconfig
index 5ca0bddf65fa244ea8221238cd708053130c81cc,0afcc3b0f87094fbe26a16f9908697eb3d4bde54..0da2ced1ae488bf58c8d95fc3c1d3a83b051405d
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/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 f5f3b799492349c5b69de5cf6664c01b32b6a22a,57e5296208043c53923790ce6b5ef5958a3f1afd..a0959ad04077d58a458e02c50097e1dc655b1da0
--- 1/arch/arm/mach-exynos/Makefile
--- 2/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

diff --cc arch/arm/plat-samsung/include/plat/devs.h
Simple merge