Commit 9f747d6c authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

[SPARC]: Merge asm-sparc{,64}/fb.h

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3cfe17fd
#ifndef _ASM_FB_H_ #ifndef _SPARC_FB_H_
#define _ASM_FB_H_ #define _SPARC_FB_H_
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/fs.h>
#include <asm/page.h>
#include <asm/prom.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) 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) ...@@ -18,4 +26,4 @@ static inline int fb_is_primary_device(struct fb_info *info)
return 0; return 0;
} }
#endif /* _ASM_FB_H_ */ #endif /* _SPARC_FB_H_ */
#ifndef _ASM_FB_H_ #include <asm-sparc/fb.h>
#define _ASM_FB_H_
#include <linux/fb.h>
#include <linux/fs.h>
#include <asm/page.h>
#include <asm/prom.h>
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);
}
static inline int fb_is_primary_device(struct fb_info *info)
{
struct device *dev = info->device;
struct device_node *node;
node = dev->archdata.prom_node;
if (node &&
node == of_console_device)
return 1;
return 0;
}
#endif /* _ASM_FB_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment