mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI
commit 1d0811b03e
upstream.
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+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0e403a383c
commit
025fae99b4
2 changed files with 3 additions and 1 deletions
|
@ -12,7 +12,7 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
|
pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_STI_CONSOLE) || defined(CONFIG_FB_STI)
|
#if defined(CONFIG_FB_STI)
|
||||||
int fb_is_primary_device(struct fb_info *info);
|
int fb_is_primary_device(struct fb_info *info);
|
||||||
#else
|
#else
|
||||||
static inline int fb_is_primary_device(struct fb_info *info)
|
static inline int fb_is_primary_device(struct fb_info *info)
|
||||||
|
|
|
@ -1127,6 +1127,7 @@ int sti_call(const struct sti_struct *sti, unsigned long func,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_FB_STI)
|
||||||
/* check if given fb_info is the primary device */
|
/* check if given fb_info is the primary device */
|
||||||
int fb_is_primary_device(struct fb_info *info)
|
int fb_is_primary_device(struct fb_info *info)
|
||||||
{
|
{
|
||||||
|
@ -1142,6 +1143,7 @@ int fb_is_primary_device(struct fb_info *info)
|
||||||
return (sti->info == info);
|
return (sti->info == info);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(fb_is_primary_device);
|
EXPORT_SYMBOL(fb_is_primary_device);
|
||||||
|
#endif
|
||||||
|
|
||||||
MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer");
|
MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer");
|
||||||
MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines");
|
MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines");
|
||||||
|
|
Loading…
Reference in a new issue