diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-02-06 05:25:53 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-24 06:17:44 +0100 |
| commit | 146b7cdba2c7afb14d965a5dc466a6532084042a (patch) | |
| tree | 58f12234a5c563607d2bee06d9dd52d68bb078fe /arch/m68k/include/asm/fb.h | |
| parent | m68k: merge the mmu and non-mmu versions of segment.h (diff) | |
| download | linux-146b7cdba2c7afb14d965a5dc466a6532084042a.tar.xz linux-146b7cdba2c7afb14d965a5dc466a6532084042a.zip | |
m68k: merge the mmu and non-mmu versions of fb.h
Trivial merge of the mmu and non-mmu versions of fb.h
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/fb.h')
| -rw-r--r-- | arch/m68k/include/asm/fb.h | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h index 97bcaefd2064..be4e4c6797e8 100644 --- a/arch/m68k/include/asm/fb.h +++ b/arch/m68k/include/asm/fb.h @@ -1,5 +1,38 @@ -#ifdef __uClinux__ -#include "fb_no.h" +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fb.h> +#include <linux/fs.h> +#include <asm/page.h> +#include <asm/setup.h> + +#ifdef CONFIG_MMU +#ifdef CONFIG_SUN3 +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE; +} #else -#include "fb_mm.h" -#endif +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + if (CPU_IS_020_OR_030) + pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030; + if (CPU_IS_040_OR_060) { + pgprot_val(vma->vm_page_prot) &= _CACHEMASK040; + /* Use no-cache mode, serialized */ + pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S; + } +} +#endif /* CONFIG_SUN3 */ +#else +#define fb_pgprotect(...) do {} while (0) +#endif /* CONFIG_MMU */ + +static inline int fb_is_primary_device(struct fb_info *info) +{ + return 0; +} + +#endif /* _ASM_FB_H_ */ |