diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-10 01:31:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-10 01:31:24 +0100 |
| commit | ad0f62e9afacca3517bd8a69c8a06389ec9bd925 (patch) | |
| tree | ed47fbbd716bd4a812372f145f0f80f3110f34b4 /include/linux/i3c | |
| parent | dba9716e82ae2c9eacfdc0925360375cd0bb6830 (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-ad0f62e9afacca3517bd8a69c8a06389ec9bd925.tar.gz linux-next-ad0f62e9afacca3517bd8a69c8a06389ec9bd925.zip | |
Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
# Conflicts:
# drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
# net/ceph/osd_client.c
Diffstat (limited to 'include/linux/i3c')
| -rw-r--r-- | include/linux/i3c/master.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index d58070a72a49..34d1f3a98343 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -11,6 +11,7 @@ #include <asm/bitsperlong.h> #include <linux/bitops.h> +#include <linux/dma-direction.h> #include <linux/i2c.h> #include <linux/i3c/ccc.h> #include <linux/i3c/device.h> |