diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-01-29 14:20:23 +0100 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-01-29 14:20:23 +0100 |
| commit | 4db102dcb0396a4ccf89b1eac0f4eb3fd167a080 (patch) | |
| tree | ea47469abffb236c5ba305c8a406e1f8209c6f34 /include/video | |
| parent | aeb262c353354eab81ab0d3242afa70984b7dc34 (diff) | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
Merge drm/drm-next into drm-misc-next
Kickstart 6.9 development cycle.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/sticore.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/video/sticore.h b/include/video/sticore.h index 012b5b46ad7d..823666af1871 100644 --- a/include/video/sticore.h +++ b/include/video/sticore.h @@ -2,7 +2,7 @@ #ifndef STICORE_H #define STICORE_H -struct fb_info; +struct device; /* generic STI structures & functions */ @@ -367,8 +367,8 @@ struct sti_struct { /* PCI data structures (pg. 17ff from sti.pdf) */ u8 rm_entry[16]; /* pci region mapper array == pci config space offset */ - /* pointer to the fb_info where this STI device is used */ - struct fb_info *info; + /* pointer to the parent device */ + struct device *dev; /* pointer to all internal data */ struct sti_all_data *sti_data; |