[PATCH 07/18] arch/m68k: Implement <asm/fb.h> with generic helpers
Thomas Zimmermann <[email protected]>
| Newsgroups | gmane.linux.kernel.cross-arch,gmane.comp.video.dri.devel,gmane.linux.kernel.arc,gmane.linux.kernel,gmane.linux.ports.arm.kernel,gmane.linux.ports.ia64,gmane.linux.ports.mips,gmane.linux.ports.parisc,gmane.linux.ports.ppc64.devel,gmane.linux.ports.sh.devel,gmane.linux.ports.sparc |
|---|---|
| Message-ID | <[email protected]> |
Replace the architecture's fb_is_primary_device() with the generic one from <asm-generic/fb.h>. No functional changes. Also use the generic helper for fb_pgprotect() on systems without MMU. Signed-off-by: Thomas Zimmermann <[email protected]> Cc: Geert Uytterhoeven <[email protected]> --- arch/m68k/include/asm/fb.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h index b86c6e2e26dd..f15a14e36826 100644 --- a/arch/m68k/include/asm/fb.h +++ b/arch/m68k/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> #include <asm/setup.h> @@ -27,13 +27,9 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, } } #endif /* CONFIG_SUN3 */ -#else -#define fb_pgprotect(...) do {} while (0) +#define fb_pgprotect fb_pgprotect #endif /* CONFIG_MMU */ -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