redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-11-16 03:26:41 -08:00 committed by David S. Miller
parent 3cfe17fdf1
commit 9f747d6c47
2 changed files with 13 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/asm-sparc/fb.h
View file

@ -1,9 +1,17 @@
#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)
return 0; return 0;
} }
#endif /* _ASM_FB_H_ */ #endif /* _SPARC_FB_H_ */

28
include/asm-sparc64/fb.h
View file

@ -1,27 +1 @@
#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_ */