summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2014-05-09 07:01:48 (GMT)
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 05:29:30 (GMT)
commit671819d83e53ede509cf76b9ecb19611752860c3 (patch)
tree09fc6a53d85da14375a346d409f0a3840985565b
parentcec25d3c15ee55d6967b25e9daa3cbefc1d2a87b (diff)
downloadlinux-3.10-671819d83e53ede509cf76b9ecb19611752860c3.zip
linux-3.10-671819d83e53ede509cf76b9ecb19611752860c3.tar.gz
linux-3.10-671819d83e53ede509cf76b9ecb19611752860c3.tar.bz2
tizen: update tizen_defconfig after usb2 phy backport
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: I999a3507e29ecfa3a95f3cdd6ec746073da32a3d
-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 aea6972..8fea0fe 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