Skip to content

Commit 94811b4

Browse files
committed
Merge tag 'reset-fixes-for-v6.10' of git://git.pengutronix.de/pza/linux into arm/fixes
Reset controller fixes for v6.10 Fix a missing GPIOLIB dependency for the GPIO reset controller and add a missing MODULE_DESCRIPTION for the hi6220 reset driver to fix some build warnings. * tag 'reset-fixes-for-v6.10' of git://git.pengutronix.de/pza/linux: reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro reset: gpio: Fix missing gpiolib dependency for GPIO reset controller Link: https://lore.kernel.org/r/20240626163443.61384-1-p.zabel@pengutronix.de Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 53ed127 + ab35896 commit 94811b4

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/reset/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ config RESET_BRCMSTB_RESCAL
6868

6969
config RESET_GPIO
7070
tristate "GPIO reset controller"
71+
depends on GPIOLIB
7172
help
7273
This enables a generic reset controller for resets attached via
7374
GPIOs. Typically for OF platforms this driver expects "reset-gpios"

drivers/reset/hisilicon/hi6220_reset.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,5 @@ static int __init hi6220_reset_init(void)
219219

220220
postcore_initcall(hi6220_reset_init);
221221

222+
MODULE_DESCRIPTION("Hisilicon Hi6220 reset controller driver");
222223
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)