parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.

[linux-2.6] / include / asm-sparc / fb.h

diff --git a/include/asm-sparc/fb.h b/include/asm-sparc/fb.h
index c7df3803099200c9e3a9a6721138d0fe8b26ae92..b83e447296553d08b9fd04541e70c024dc6276a2 100644 (file)
--- a/include/asm-sparc/fb.h
+++ b/include/asm-sparc/fb.h
@@ -1,12 +1,29 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
+#ifndef _SPARC_FB_H_
+#define _SPARC_FB_H_
 #include <linux/fb.h>
+#include <linux/fs.h>
+#include <asm/page.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)
 {
+       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_ */
+#endif /* _SPARC_FB_H_ */