diff options
| author | Maarten Lankhorst <dev@lankhorst.se> | 2026-07-13 11:32:29 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <dev@lankhorst.se> | 2026-07-13 11:32:29 +0200 |
| commit | ac3ee180a8cf9e00ffd4fc8cc670a8b2d6f9b2f2 (patch) | |
| tree | 389dd45860aaa6d9386b9396bb63fc057ab6ffac /include/linux/amba/bus.h | |
| parent | e4159045c2704dfe146f0ccb0445d9d074cd6882 (diff) | |
| parent | a13c140cc289c0b7b3770bce5b3ad42ab35074aa (diff) | |
| download | linux-next-ac3ee180a8cf9e00ffd4fc8cc670a8b2d6f9b2f2.tar.gz linux-next-ac3ee180a8cf9e00ffd4fc8cc670a8b2d6f9b2f2.zip | |
Merge v7.2-rc3 into drm-misc-fixes
Forward from rc1 to rc3 to track upstream closer again.
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
Diffstat (limited to 'include/linux/amba/bus.h')
| -rw-r--r-- | include/linux/amba/bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 6c54d5c0d21f..80a74cd2da7e 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -13,7 +13,7 @@ #include <linux/clk.h> #include <linux/device.h> -#include <linux/mod_devicetable.h> +#include <linux/device-id/amba.h> #include <linux/err.h> #include <linux/resource.h> #include <linux/regulator/consumer.h> |