diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-12-05 22:48:58 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-12-05 22:50:14 +0300 |
| commit | 302cc446cbd92aadff72a647cebc13d5634f8342 (patch) | |
| tree | 759fe019d2e1c82ca8590f34c7ba46ab9ddada6e /include/linux/amba | |
| parent | da4fa00abe5674d3d165cfd8032c740e8aab4d3b (diff) | |
| parent | 896d8946da97332d4dc80fa1937d8dd6b1c35ad4 (diff) | |
| download | linux-302cc446cbd92aadff72a647cebc13d5634f8342.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.13-rc2).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/bus.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index dda2f3ea89cb..9946276aff73 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -121,6 +121,7 @@ extern const struct bus_type amba_bustype; #ifdef CONFIG_ARM_AMBA int __amba_driver_register(struct amba_driver *, struct module *); void amba_driver_unregister(struct amba_driver *); +bool dev_is_amba(const struct device *dev); #else static inline int __amba_driver_register(struct amba_driver *drv, struct module *owner) @@ -130,6 +131,10 @@ static inline int __amba_driver_register(struct amba_driver *drv, static inline void amba_driver_unregister(struct amba_driver *drv) { } +static inline bool dev_is_amba(const struct device *dev) +{ + return false; +} #endif struct amba_device *amba_device_alloc(const char *, resource_size_t, size_t); |