From 97054713a2445894c42efa9977d3bba5966e5099 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 2 Jan 2024 12:25:27 +0000 Subject: [PATCH] ANDROID: GKI: Remove GENERIC_PHY from gki_defconfig With commit d0ec7b9c3153 ("phy: Kconfig: Select GENERIC_PHY for GENERIC_PHY_MIPI_DPHY"), CONFIG_GENERIC_PHY is selected by the Kconfig system so no need to set it manually in the gki_defconfig files. Fixes: d0ec7b9c3153 ("phy: Kconfig: Select GENERIC_PHY for GENERIC_PHY_MIPI_DPHY") Change-Id: I86bc4ada3799b3b9b86fdf1bc9ae599e76dddf21 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/configs/gki_defconfig | 1 - arch/riscv/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 12cfa18ec12c..c2d5a228baa9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -552,7 +552,6 @@ CONFIG_IIO=y CONFIG_IIO_BUFFER=y CONFIG_IIO_TRIGGER=y CONFIG_PWM=y -CONFIG_GENERIC_PHY=y CONFIG_POWERCAP=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig index ba5e18a0aebf..85d2468fd9dc 100644 --- a/arch/riscv/configs/gki_defconfig +++ b/arch/riscv/configs/gki_defconfig @@ -503,7 +503,6 @@ CONFIG_IIO_BUFFER=y CONFIG_IIO_TRIGGER=y CONFIG_PWM=y CONFIG_RESET_CONTROLLER=y -CONFIG_GENERIC_PHY=y CONFIG_POWERCAP=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y