diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 03:26:41 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 04:18:29 -0800 |
| commit | 9f747d6c4724dd3afa7d3525f6dd5300fc1633c5 (patch) | |
| tree | 921805b849a832bab142cffe2754d2ca79d3ea5e /include/asm-sparc | |
| parent | 3cfe17fdf192bc8f69305d56a09a4cbb1edc57b8 (diff) | |
| download | op-kernel-dev-9f747d6c4724dd3afa7d3525f6dd5300fc1633c5.zip op-kernel-dev-9f747d6c4724dd3afa7d3525f6dd5300fc1633c5.tar.gz | |
[SPARC]: Merge asm-sparc{,64}/fb.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/fb.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/asm-sparc/fb.h b/include/asm-sparc/fb.h index c73ca08..b83e447 100644 --- a/include/asm-sparc/fb.h +++ b/include/asm-sparc/fb.h @@ -1,9 +1,17 @@ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ +#ifndef _SPARC_FB_H_ +#define _SPARC_FB_H_ #include <linux/fb.h> +#include <linux/fs.h> +#include <asm/page.h> #include <asm/prom.h> -#define fb_pgprotect(...) do {} while (0) +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ +#ifdef CONFIG_SPARC64 + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +#endif +} static inline int fb_is_primary_device(struct fb_info *info) { @@ -18,4 +26,4 @@ static inline int fb_is_primary_device(struct fb_info *info) return 0; } -#endif /* _ASM_FB_H_ */ +#endif /* _SPARC_FB_H_ */ |
