summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-06-25 05:16:22 -0700
committerOlof Johansson <olof@lixom.net>2019-06-25 05:16:22 -0700
commit5cf0fb260a322bca9eb7a7ebd92d05edb4fff586 (patch)
treea7d7da508b7e552cbb68a5bc3339dd8de4f49958 /arch
parent9dd1901b8cb66f60f59b56c43d74b75bb20130ae (diff)
parentb995421faef5b24ee8ec60d66b356b57ca0c8b77 (diff)
downloadlinux-stable-5cf0fb260a322bca9eb7a7ebd92d05edb4fff586.tar.gz
linux-stable-5cf0fb260a322bca9eb7a7ebd92d05edb4fff586.tar.bz2
linux-stable-5cf0fb260a322bca9eb7a7ebd92d05edb4fff586.zip
Merge tag 'renesas-arm-defconfig-for-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/defconfig
Renesas ARM Based SoC Defconfig Updates for v5.3 * Remove GENERIC_PHY from shmobile_defconfig as it is now selected * tag 'renesas-arm-defconfig-for-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove GENERIC_PHY from shmobile_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/shmobile_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index eb02ba9ec6e6..c6c70355141c 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -197,7 +197,6 @@ CONFIG_PWM=y
CONFIG_PWM_RCAR=y
CONFIG_PWM_RENESAS_TPU=y
CONFIG_RESET_CONTROLLER=y
-CONFIG_GENERIC_PHY=y
CONFIG_PHY_RCAR_GEN2=y
CONFIG_PHY_RCAR_GEN3_USB2=y
# CONFIG_DNOTIFY is not set