Merge git://git.infradead.org/~dwmw2/random-2.6

[pandora-kernel.git] / include / asm-sparc64 / fb.h

diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h
index 389012e..1c2ac58 100644 (file)
--- 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>