summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-07-13 09:40:17 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2012-07-13 09:40:17 (GMT)
commitd6e2796b3b8d94b7048dc63162b93936c25485cd (patch)
treec0859044b7296e06b48804c0ff75abbdaef9599a /arch/arm/mach-exynos/Kconfig
parentbd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff)
parent1521109318466c2e064dcbd732aa64f99a62852f (diff)
downloadlinux-fsl-qoriq-d6e2796b3b8d94b7048dc63162b93936c25485cd.tar.xz
Merge branch 'next/board-samsung' into next/board-samsung-2
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r--arch/arm/mach-exynos/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 6f6d13f..498596b 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -207,6 +207,7 @@ config MACH_SMDKV310
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
@@ -326,6 +327,7 @@ config MACH_ORIGEN
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