summaryrefslogtreecommitdiff
path: root/drivers/power/reset/Kconfig
diff options
context:
space:
mode:
authorSebastian Reichel <sebastian.reichel@collabora.com>2023-10-21 01:55:43 +0300
committerSebastian Reichel <sebastian.reichel@collabora.com>2023-10-21 01:55:43 +0300
commite186bd1ac2f984f525b319924cfb0e197051ba47 (patch)
tree2b78957a7ef7a98ea6664f067c5906784567648e /drivers/power/reset/Kconfig
parentafc88dfda013970bb1e214b331e99adca2f98312 (diff)
parent8894b432548851f705f72ff135d3dcbd442a18d1 (diff)
downloadlinux-e186bd1ac2f984f525b319924cfb0e197051ba47.tar.xz
Merge power-supply fixes for 6.6 cycle
Merge power-supply fixes for the 6.6 cycle, so that changes to the vexpress driver apply cleanly. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/reset/Kconfig')
-rw-r--r--drivers/power/reset/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index b9733fa40276..fece990af4a7 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -300,7 +300,7 @@ config NVMEM_REBOOT_MODE
config POWER_MLXBF
tristate "Mellanox BlueField power handling driver"
- depends on (GPIO_MLXBF2 && ACPI)
+ depends on (GPIO_MLXBF2 || GPIO_MLXBF3) && ACPI
help
This driver supports reset or low power mode handling for Mellanox BlueField.