diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-01-02 10:31:03 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-01-02 10:31:03 +0100 |
| commit | 0d8eae7b124e2ddaee00f186fe922450faad0ed7 (patch) | |
| tree | 5acf7a7a4300665c26b128d9afd1843b402e8b8e /drivers/gpu/drm/tiny/bochs.c | |
| parent | drm/i915/mtl: Add support of Tile4 to MTL (diff) | |
| parent | Linux 6.2-rc1 (diff) | |
| download | linux-0d8eae7b124e2ddaee00f186fe922450faad0ed7.tar.xz linux-0d8eae7b124e2ddaee00f186fe922450faad0ed7.zip | |
Merge drm/drm-next into drm-intel-next
Sync up with v6.2-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/tiny/bochs.c')
| -rw-r--r-- | drivers/gpu/drm/tiny/bochs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index 04682f831544..024346054c70 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -7,7 +7,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_edid.h> -#include <drm/drm_fb_helper.h> +#include <drm/drm_fbdev_generic.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_framebuffer_helper.h> |