diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-07-13 02:54:56 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-13 02:54:56 +0200 |
| commit | e23a5e14aa278858c2e3d81ec34e83aa9a4177c5 (patch) | |
| tree | 8b662fca8f0643d2b7ef0836da91835408075208 /drivers/video/console | |
| parent | Merge tag 'mediatek-drm-next-5.20' of https://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Linux 5.19-rc6 (diff) | |
| download | linux-e23a5e14aa278858c2e3d81ec34e83aa9a4177c5.tar.xz linux-e23a5e14aa278858c2e3d81ec34e83aa9a4177c5.zip | |
Backmerge tag 'v5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge in rc6 so I can merge msm next easier.
Linux 5.19-rc6
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/sticore.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index fa23bf0247b0..bd4dc97d4d34 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -1148,6 +1148,7 @@ int sti_call(const struct sti_struct *sti, unsigned long func, return ret; } +#if defined(CONFIG_FB_STI) /* check if given fb_info is the primary device */ int fb_is_primary_device(struct fb_info *info) { @@ -1163,6 +1164,7 @@ int fb_is_primary_device(struct fb_info *info) return (sti->info == info); } EXPORT_SYMBOL(fb_is_primary_device); +#endif MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer"); MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines"); |