Thomas Zimmermann <tzimmermann@xxxxxxx> writes:
> Replace the architecture's fb_is_primary_device() with the generic
> one from <asm-generic/fb.h>. No functional changes.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
> Cc: Christophe Leroy <christophe.leroy@xxxxxxxxxx>
> ---
> arch/powerpc/include/asm/fb.h | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
Looks fine.
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> (powerpc)
cheers
> diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/fb.h
> index 6541ab77c5b9..5f1a2e5f7654 100644
> --- a/arch/powerpc/include/asm/fb.h
> +++ b/arch/powerpc/include/asm/fb.h
> @@ -2,8 +2,8 @@
> #ifndef _ASM_FB_H_
> #define _ASM_FB_H_
>
> -#include <linux/fb.h>
> #include <linux/fs.h>
> +
> #include <asm/page.h>
>
> static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
> @@ -13,10 +13,8 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
> vma->vm_end - vma->vm_start,
> vma->vm_page_prot);
> }
> +#define fb_pgprotect fb_pgprotect
>
> -static inline int fb_is_primary_device(struct fb_info *info)
> -{
> - return 0;
> -}
> +#include <asm-generic/fb.h>
>
> #endif /* _ASM_FB_H_ */
> --
> 2.40.0
