diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-12-11 23:06:05 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-12-11 23:06:05 +0300 |
| commit | e7f0a3a6f7339af55f1ca2c27131739d75569c08 (patch) | |
| tree | b4e84b5457f175227c5fc85869108164d47813c9 /include/linux/string.h | |
| parent | bc5b7ba159361cd89ed9c14583f9b0e3c39ef450 (diff) | |
| parent | fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 (diff) | |
| download | linux-e7f0a3a6f7339af55f1ca2c27131739d75569c08.tar.xz | |
Merge drm/drm-next into drm-intel-next
Catching up with 6.13-rc2.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 0dd27afcfaf7..493ac4862c77 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -335,7 +335,6 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s); #ifdef CONFIG_BINARY_PRINTF int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args); int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf); -int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...) __printf(3, 4); #endif extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos, |