summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2014-05-09 09:01:48 +0200
committerChanho Park <chanho61.park@samsung.com>2014-08-08 15:19:57 +0900
commit8f720887467f622ff47d6321547f37af6beb3e3e (patch)
tree858f0f4212769b17409a9091f2e1f7a440cbe040 /arch
parent3fa40f09c4c686651b4d4b83e3dc15a8cf040979 (diff)
downloadlinux-3.10-8f720887467f622ff47d6321547f37af6beb3e3e.tar.gz
linux-3.10-8f720887467f622ff47d6321547f37af6beb3e3e.tar.bz2
linux-3.10-8f720887467f622ff47d6321547f37af6beb3e3e.zip
tizen: update tizen_defconfig after usb2 phy backport
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: I999a3507e29ecfa3a95f3cdd6ec746073da32a3d
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tizen_defconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/configs/tizen_defconfig b/arch/arm/configs/tizen_defconfig
index aea697205a4..8fea0fedf3e 100644
--- a/arch/arm/configs/tizen_defconfig
+++ b/arch/arm/configs/tizen_defconfig
@@ -2998,7 +2998,6 @@ CONFIG_EXTCON=y
#
# Extcon Device Drivers
#
-CONFIG_OF_EXTCON=y
CONFIG_EXTCON_GPIO=y
CONFIG_EXTCON_ADC_JACK=y
CONFIG_EXTCON_MAX77693=y
@@ -3130,10 +3129,10 @@ CONFIG_GIC_NON_BANKED=y
#
CONFIG_GENERIC_PHY=y
CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
-CONFIG_PHY_EXYNOS_USB=y
-CONFIG_PHY_EXYNOS4210_USB=y
-CONFIG_PHY_EXYNOS4212_USB=y
CONFIG_EXYNOS_PHY=y
+CONFIG_PHY_SAMSUNG_USB2=y
+CONFIG_PHY_EXYNOS4210_USB2=y
+CONFIG_PHY_EXYNOS4X12_USB2=y
#
# File systems