diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-17 17:17:28 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-17 17:17:28 -1000 |
| commit | cf52ad5ff16c38a62a6536b5e7612b56794f5a5e (patch) | |
| tree | 2d92a90ac90a417400625b5740c176202d61d821 /drivers/soc | |
| parent | Merge tag 'char-misc-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (diff) | |
| parent | drivers: bus: Delete CONFIG_SIMPLE_PM_BUS (diff) | |
| download | linux-dev-cf52ad5ff16c38a62a6536b5e7612b56794f5a5e.tar.xz linux-dev-cf52ad5ff16c38a62a6536b5e7612b56794f5a5e.zip | |
Merge tag 'driver-core-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are some small driver core fixes for 5.15-rc6, all of which have
been in linux-next for a while with no reported issues.
They include:
- kernfs negative dentry bugfix
- simple pm bus fixes to resolve reported issues"
* tag 'driver-core-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
drivers: bus: Delete CONFIG_SIMPLE_PM_BUS
drivers: bus: simple-pm-bus: Add support for probing simple bus only devices
driver core: Reject pointless SYNC_STATE_ONLY device links
kernfs: don't create a negative dentry if inactive node exists
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/canaan/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/soc/canaan/Kconfig b/drivers/soc/canaan/Kconfig index 8179b69518b4..853096b7e84c 100644 --- a/drivers/soc/canaan/Kconfig +++ b/drivers/soc/canaan/Kconfig @@ -5,7 +5,6 @@ config SOC_K210_SYSCTL depends on RISCV && SOC_CANAAN && OF default SOC_CANAAN select PM - select SIMPLE_PM_BUS select SYSCON select MFD_SYSCON help |