1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index dfad6538b27..2bf7d6e2398 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -42,6 +42,7 @@ config SOC_EXYNOS4212
         bool "SAMSUNG EXYNOS4212"
         default y
         depends on ARCH_EXYNOS4
+        select SAMSUNG_DMADEV
         select S5P_PM if PM
         select S5P_SLEEP if PM
         help
@@ -51,6 +52,7 @@ config SOC_EXYNOS4412
         bool "SAMSUNG EXYNOS4412"
         default y
         depends on ARCH_EXYNOS4
+        select SAMSUNG_DMADEV
         help
           Enable EXYNOS4412 SoC support
 
@@ -179,7 +181,9 @@ config MACH_SMDKV310
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
         select S5P_DEV_FIMC3
+        select S5P_DEV_G2D
         select S5P_DEV_I2C_HDMIPHY
+        select S5P_DEV_JPEG
         select S5P_DEV_MFC
         select S5P_DEV_TV
         select S5P_DEV_USB_EHCI
@@ -225,7 +229,9 @@ config MACH_UNIVERSAL_C210
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
         select S5P_DEV_FIMC3
+        select S5P_DEV_G2D
         select S5P_DEV_CSIS0
+        select S5P_DEV_JPEG
         select S5P_DEV_FIMD0
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC2
@@ -262,11 +268,14 @@ config MACH_NURI
         select S3C_DEV_I2C1
         select S3C_DEV_I2C3
         select S3C_DEV_I2C5
+        select S3C_DEV_I2C6
         select S5P_DEV_CSIS0
+        select S5P_DEV_JPEG
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
         select S5P_DEV_FIMC3
+        select S5P_DEV_G2D
         select S5P_DEV_MFC
         select S5P_DEV_USB_EHCI
         select S5P_SETUP_MIPIPHY
@@ -276,6 +285,7 @@ config MACH_NURI
         select EXYNOS4_SETUP_I2C1
         select EXYNOS4_SETUP_I2C3
         select EXYNOS4_SETUP_I2C5
+        select EXYNOS4_SETUP_I2C6
         select EXYNOS4_SETUP_SDHCI
         select EXYNOS4_SETUP_USB_PHY
         select S5P_SETUP_MIPIPHY
@@ -296,7 +306,9 @@ config MACH_ORIGEN
         select S5P_DEV_FIMC2
         select S5P_DEV_FIMC3
         select S5P_DEV_FIMD0
+        select S5P_DEV_G2D
         select S5P_DEV_I2C_HDMIPHY
+        select S5P_DEV_JPEG
         select S5P_DEV_MFC
         select S5P_DEV_TV
         select S5P_DEV_USB_EHCI
@@ -325,6 +337,7 @@ config MACH_SMDK4212
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_KEYPAD
         select SAMSUNG_DEV_PWM
+        select EXYNOS4_DEV_DMA
         select EXYNOS4_SETUP_I2C1
         select EXYNOS4_SETUP_I2C3
         select EXYNOS4_SETUP_I2C7