diff options
Diffstat (limited to 'arch/ia64/include/asm/fb.h')
| -rw-r--r-- | arch/ia64/include/asm/fb.h | 27 | 
1 files changed, 23 insertions, 4 deletions
| diff --git a/arch/ia64/include/asm/fb.h b/arch/ia64/include/asm/fb.h index 5f95782bfa46..1717b26fd423 100644 --- a/arch/ia64/include/asm/fb.h +++ b/arch/ia64/include/asm/fb.h @@ -2,11 +2,14 @@  #ifndef _ASM_FB_H_  #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> +#include <linux/compiler.h>  #include <linux/efi.h> +#include <linux/string.h> +  #include <asm/page.h> +struct file; +  static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,  				unsigned long off)  { @@ -15,10 +18,26 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,  	else  		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);  } +#define fb_pgprotect fb_pgprotect + +static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n) +{ +	memcpy(to, (void __force *)from, n); +} +#define fb_memcpy_fromio fb_memcpy_fromio -static inline int fb_is_primary_device(struct fb_info *info) +static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)  { -	return 0; +	memcpy((void __force *)to, from, n);  } +#define fb_memcpy_toio fb_memcpy_toio + +static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) +{ +	memset((void __force *)addr, c, n); +} +#define fb_memset fb_memset_io + +#include <asm-generic/fb.h>  #endif /* _ASM_FB_H_ */ | 
