diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2022-09-21 09:58:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-09-21 09:58:02 +0200 |
| commit | 74656d03ac36fabb16b9df5221cf398ee3a9ca08 (patch) | |
| tree | 0600e619ac817e2c016c148810814f55280316cc /include/linux/of_device.h | |
| parent | locking: Add __sched to semaphore functions (diff) | |
| parent | Linux 6.0-rc6 (diff) | |
| download | linux-dev-74656d03ac36fabb16b9df5221cf398ee3a9ca08.tar.xz linux-dev-74656d03ac36fabb16b9df5221cf398ee3a9ca08.zip | |
Merge tag 'v6.0-rc6' into locking/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/of_device.h')
| -rw-r--r-- | include/linux/of_device.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 1d7992a02e36..1a803e4335d3 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -101,8 +101,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) } static inline int of_dma_configure_id(struct device *dev, - struct device_node *np, - bool force_dma) + struct device_node *np, + bool force_dma, + const u32 *id) { return 0; } |