Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[SPARC]: Merge asm-sparc{,64}/fb.h
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by David S. Miller and committed by David S. Miller 9f747d6c 3cfe17fd
+12
-4
include/asm-sparc/fb.h
+12
-4
include/asm-sparc/fb.h
···
1
+
#ifndef _SPARC_FB_H_
2
+
#define _SPARC_FB_H_
3
#include <linux/fb.h>
4
+
#include <linux/fs.h>
5
+
#include <asm/page.h>
6
#include <asm/prom.h>
7
8
+
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
9
+
unsigned long off)
10
+
{
11
+
#ifdef CONFIG_SPARC64
12
+
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
13
+
#endif
14
+
}
15
16
static inline int fb_is_primary_device(struct fb_info *info)
17
{
···
18
return 0;
19
}
20
21
+
#endif /* _SPARC_FB_H_ */
+1
-27
include/asm-sparc64/fb.h
+1
-27
include/asm-sparc64/fb.h
···
1
-
#ifndef _ASM_FB_H_
2
-
#define _ASM_FB_H_
3
-
#include <linux/fb.h>
4
-
#include <linux/fs.h>
5
-
#include <asm/page.h>
6
-
#include <asm/prom.h>
7
-
8
-
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
9
-
unsigned long off)
10
-
{
11
-
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
12
-
}
13
-
14
-
static inline int fb_is_primary_device(struct fb_info *info)
15
-
{
16
-
struct device *dev = info->device;
17
-
struct device_node *node;
18
-
19
-
node = dev->archdata.prom_node;
20
-
if (node &&
21
-
node == of_console_device)
22
-
return 1;
23
-
24
-
return 0;
25
-
}
26
-
27
-
#endif /* _ASM_FB_H_ */