git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
fb.h
diff --git
a/arch/x86/include/asm/fb.h
b/arch/x86/include/asm/fb.h
index 53018464aea653a407dc32e6be3d95ac14230306..2519d0679d990963993eb8e024fbdd00e55df477 100644
(file)
--- a/
arch/x86/include/asm/fb.h
+++ b/
arch/x86/include/asm/fb.h
@@
-12,10
+12,6
@@
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
}
-#ifdef CONFIG_X86_32
extern int fb_is_primary_device(struct fb_info *info);
-#else
-static inline int fb_is_primary_device(struct fb_info *info) { return 0; }
-#endif
#endif /* _ASM_X86_FB_H */