diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-01-24 19:23:03 +0300 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-01-24 19:23:03 +0300 |
| commit | 9635adf8541ae9cbead19d769dce2c945fa88de6 (patch) | |
| tree | acab90e8fb7c2e4c04a39d72d51a55bf8b1e8b8f /scripts/basic | |
| parent | 1ec23ed7126e6b8fab287598576e84e26e6482ef (diff) | |
| parent | 045e8d102f44ad75dca0b0ec9eede15ea89da673 (diff) | |
| download | linux-9635adf8541ae9cbead19d769dce2c945fa88de6.tar.xz | |
Merge drm/drm-next into drm-intel-gt-next
Lets eradicate a silent conflict between drm-intel-next and
drm-intel-gt-next which added a duplicate function (try_firmware_load).
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'scripts/basic')
| -rw-r--r-- | scripts/basic/fixdep.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 2328f9a641da..f932aeaba71a 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -94,7 +94,6 @@ #include <unistd.h> #include <fcntl.h> #include <string.h> -#include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> |