Merge branch 'next/board-samsung' into next/board-samsung-2

diff --combined arch/arm/mach-exynos/Kconfig
index 6f6d13f,f5fb6ea..498596b
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -207,12 -207,13 +207,13 @@@ config MACH_SMDKV31
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
+       select S3C_DEV_USB_HSOTG
        select SAMSUNG_DEV_BACKLIGHT
        select EXYNOS_DEV_DRM
        select EXYNOS_DEV_SYSMMU
        select EXYNOS4_DEV_AHCI
        select SAMSUNG_DEV_KEYPAD
 -      select EXYNOS4_DEV_DMA
 +      select EXYNOS_DEV_DMA
        select SAMSUNG_DEV_PWM
        select EXYNOS4_DEV_USB_OHCI
        select EXYNOS4_SETUP_FIMD0
@@@ -264,7 -265,7 +265,7 @@@ config MACH_UNIVERSAL_C21
        select S5P_DEV_ONENAND
        select S5P_DEV_TV
        select EXYNOS_DEV_SYSMMU
 -      select EXYNOS4_DEV_DMA
 +      select EXYNOS_DEV_DMA
        select EXYNOS_DEV_DRM
        select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_I2C1
@@@ -303,7 -304,7 +304,7 @@@ config MACH_NUR
        select S5P_DEV_MFC
        select S5P_DEV_USB_EHCI
        select S5P_SETUP_MIPIPHY
 -      select EXYNOS4_DEV_DMA
 +      select EXYNOS_DEV_DMA
        select EXYNOS_DEV_DRM
        select EXYNOS4_SETUP_FIMC
        select EXYNOS4_SETUP_FIMD0
@@@ -326,6 -327,7 +327,7 @@@ config MACH_ORIGE
        select S3C_DEV_WDT
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
+       select S3C_DEV_USB_HSOTG
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
@@@ -341,7 -343,7 +343,7 @@@
        select SAMSUNG_DEV_PWM
        select EXYNOS_DEV_DRM
        select EXYNOS_DEV_SYSMMU
 -      select EXYNOS4_DEV_DMA
 +      select EXYNOS_DEV_DMA
        select EXYNOS4_DEV_USB_OHCI
        select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_SDHCI