diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-01-22 15:10:10 -0800 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-01-22 15:10:10 -0800 |
| commit | be3382ecdf317f005e7d47356d0a9256cc36dd88 (patch) | |
| tree | 40ee42db6c5c510d998c23696a27254f22289094 /include/linux/pm_clock.h | |
| parent | f6bf0424cadc27d7cf6a049d2db960e4b52fa513 (diff) | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
Merge drm/drm-next into drm-xe-next
Sync to v6.8-rc1.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'include/linux/pm_clock.h')
| -rw-r--r-- | include/linux/pm_clock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h index ada3a0ab10bf..68669ce18720 100644 --- a/include/linux/pm_clock.h +++ b/include/linux/pm_clock.h @@ -91,10 +91,10 @@ static inline int devm_pm_clk_create(struct device *dev) #endif #ifdef CONFIG_HAVE_CLK -extern void pm_clk_add_notifier(struct bus_type *bus, +extern void pm_clk_add_notifier(const struct bus_type *bus, struct pm_clk_notifier_block *clknb); #else -static inline void pm_clk_add_notifier(struct bus_type *bus, +static inline void pm_clk_add_notifier(const struct bus_type *bus, struct pm_clk_notifier_block *clknb) { } |