diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-04-04 14:37:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-04-04 14:37:11 +0200 |
| commit | 45c88e9e82820b72c0aa33d99f8a2b7d8c2afd7c (patch) | |
| tree | 952d3ff5e323bd48506fa6c1f37e1625b6cd2f55 /include | |
| parent | 0ad2507d5d93f39619fc42372c347d6006b64319 (diff) | |
| parent | c25951eb7518844fcb7fc9ec58e888731e8c46d0 (diff) | |
Merge tag 'soc_fsl-6.15-1' of https://github.com/chleroy/linux into soc/drivers-2
FSL SOC Changes for 6.15:
- irqdomain cleanups from Jiry
- Add Ioana as Maintainer of fsl-mc bus and remove Laurentiu and Stuart
- Remove deadcode from fsl-mc bus
* tag 'soc_fsl-6.15-1' of https://github.com/chleroy/linux:
bus: fsl-mc: Remove deadcode
MAINTAINERS: add the linuppc-dev list to the fsl-mc bus entry
MAINTAINERS: fix nonexistent dtbinding file name
MAINTAINERS: add myself as maintainer for the fsl-mc bus
irqdomain: soc: Switch to irq_find_mapping()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl/mc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h index 99f30c7d6208..897d6211c163 100644 --- a/include/linux/fsl/mc.h +++ b/include/linux/fsl/mc.h @@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, void fsl_mc_portal_free(struct fsl_mc_io *mc_io); -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); - int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, enum fsl_mc_pool_type pool_type, struct fsl_mc_device **new_mc_adev); |