diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-02-23 10:27:32 +0100 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-02-23 10:27:32 +0100 |
| commit | 27121864ab366992583d894961ecdc6e2ffe0ca1 (patch) | |
| tree | 87ef1dcf82ce2d0d29b686d5ae81003ab3eb3b4a /include/uapi/linux/io_uring.h | |
| parent | 84549c816dc317f012798e706e58669b3b013604 (diff) | |
| parent | f047382519ca41702ebaee5a862e87390f687137 (diff) | |
Merge tag 'spi-nor/for-6.3' into mtd/next
SPI NOR changes:
* small fixes on core and spansion driver.
Diffstat (limited to 'include/uapi/linux/io_uring.h')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 9d4c4078e8d0..2780bce62faf 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -10,7 +10,15 @@ #include <linux/fs.h> #include <linux/types.h> +/* + * this file is shared with liburing and that has to autodetect + * if linux/time_types.h is available or not, it can + * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H + * if linux/time_types.h is not available + */ +#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H #include <linux/time_types.h> +#endif #ifdef __cplusplus extern "C" { |