diff options
Diffstat (limited to 'arch/mips/include/asm/fb.h')
| -rw-r--r-- | arch/mips/include/asm/fb.h | 28 | 
1 files changed, 24 insertions, 4 deletions
| diff --git a/arch/mips/include/asm/fb.h b/arch/mips/include/asm/fb.h index bd3f68c9ddfc..18b7226403ba 100644 --- a/arch/mips/include/asm/fb.h +++ b/arch/mips/include/asm/fb.h @@ -1,19 +1,39 @@  #ifndef _ASM_FB_H_  #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h>  #include <asm/page.h> +struct file; +  static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,  				unsigned long off)  {  	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);  } +#define fb_pgprotect fb_pgprotect -static inline int fb_is_primary_device(struct fb_info *info) +/* + * MIPS doesn't define __raw_ I/O macros, so the helpers + * in <asm-generic/fb.h> don't generate fb_readq() and + * fb_write(). We have to provide them here. + * + * TODO: Convert MIPS to generic I/O. The helpers below can + *       then be removed. + */ +#ifdef CONFIG_64BIT +static inline u64 fb_readq(const volatile void __iomem *addr)  { -	return 0; +	return __raw_readq(addr);  } +#define fb_readq fb_readq + +static inline void fb_writeq(u64 b, volatile void __iomem *addr) +{ +	__raw_writeq(b, addr); +} +#define fb_writeq fb_writeq +#endif + +#include <asm-generic/fb.h>  #endif /* _ASM_FB_H_ */ | 
