summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos4/Kconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-06-14 12:53:42 (GMT)
committerTony Lindgren <tony@atomide.com>2011-06-14 12:53:42 (GMT)
commitb8ce9fb8e18af7466e0b915bb5979322cdace322 (patch)
treeeec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/arm/mach-exynos4/Kconfig
parentc8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff)
parente9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff)
downloadlinux-fsl-qoriq-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.xz
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/arm/mach-exynos4/Kconfig')
-rw-r--r--arch/arm/mach-exynos4/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index b92c1e5..1435fc3 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC
help
Common setup code for the camera interfaces.
+config EXYNOS4_SETUP_USB_PHY
+ bool
+ help
+ Common setup code for USB PHY controller
+
# machine support
menu "EXYNOS4 Machines"
@@ -176,6 +181,7 @@ config MACH_NURI
select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C5
select EXYNOS4_SETUP_SDHCI
+ select EXYNOS4_SETUP_USB_PHY
select SAMSUNG_DEV_PWM
help
Machine support for Samsung Mobile NURI Board.