diff options
| author | Helge Deller <deller@gmx.de> | 2022-06-07 12:57:58 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-06-07 13:01:17 +0200 |
| commit | 1d0811b03eb30b2f0793acaa96c6ce90b8b9c87a (patch) | |
| tree | 611de7a3d616ebb6537129268fa4d32b69463d2e /drivers/video | |
| parent | Linux 5.19-rc1 (diff) | |
| download | linux-1d0811b03eb30b2f0793acaa96c6ce90b8b9c87a.tar.xz linux-1d0811b03eb30b2f0793acaa96c6ce90b8b9c87a.zip | |
parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI
Fix this build error noticed by the kernel test robot:
drivers/video/console/sticore.c:1132:5: error: redefinition of 'fb_is_primary_device'
arch/parisc/include/asm/fb.h:18:19: note: previous definition of 'fb_is_primary_device'
Signed-off-by: Helge Deller <deller@gmx.de>
Reported-by: kernel test robot <lkp@intel.com>
Cc: stable@vger.kernel.org # v5.10+
Diffstat (limited to 'drivers/video')
| -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"); |