diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 03:26:41 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 04:18:29 -0800 |
| commit | 9f747d6c4724dd3afa7d3525f6dd5300fc1633c5 (patch) | |
| tree | 921805b849a832bab142cffe2754d2ca79d3ea5e /include/asm-sparc64 | |
| parent | 3cfe17fdf192bc8f69305d56a09a4cbb1edc57b8 (diff) | |
| download | linux-3.10-9f747d6c4724dd3afa7d3525f6dd5300fc1633c5.tar.gz linux-3.10-9f747d6c4724dd3afa7d3525f6dd5300fc1633c5.tar.bz2 linux-3.10-9f747d6c4724dd3afa7d3525f6dd5300fc1633c5.zip | |
[SPARC]: Merge asm-sparc{,64}/fb.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/fb.h | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h index 389012e5fba..1c2ac5832f3 100644 --- a/include/asm-sparc64/fb.h +++ b/include/asm-sparc64/fb.h @@ -1,27 +1 @@ -#ifndef _ASM_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_ */ +#include <asm-sparc/fb.h> |