diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2026-02-25 13:23:04 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-02-25 13:23:04 +0200 |
| commit | f09812b85fa6f41058bcc46e70ac406bf9b0493a (patch) | |
| tree | 3c9b679b33a85434ea937b6e74d3be3b6f9629ff /include/video | |
| parent | 24e2e6581d602f75174010b32bf3e96ec39465ab (diff) | |
| parent | 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f (diff) | |
Merge drm/drm-next into drm-intel-next
Sync with v7.0-rc1 which contains a few treewide changes affecting i915.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/edid.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/video/edid.h b/include/video/edid.h index c2b186b1933a..52aabb706032 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -4,8 +4,4 @@ #include <uapi/video/edid.h> -#if defined(CONFIG_FIRMWARE_EDID) -extern struct edid_info edid_info; -#endif - #endif /* __linux_video_edid_h__ */ |