patch-2.4.20 linux-2.4.20/drivers/video/vesafb.c
Next file: linux-2.4.20/drivers/video/vga.h
Previous file: linux-2.4.20/drivers/video/tx3912fb.h
Back to the patch index
Back to the overall index
- Lines: 44
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/drivers/video/vesafb.c
- Orig date:
Wed Nov 14 14:52:20 2001
diff -urN linux-2.4.19/drivers/video/vesafb.c linux-2.4.20/drivers/video/vesafb.c
@@ -109,6 +109,7 @@
static int vesafb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info)
{
+#ifdef __i386__
int offset;
if (!ypan)
@@ -130,6 +131,7 @@
"c" (offset), /* ECX */
"d" (offset >> 16), /* EDX */
"D" (&pmi_start)); /* EDI */
+#endif
return 0;
}
@@ -302,6 +304,7 @@
static void vesa_setpalette(int regno, unsigned red, unsigned green, unsigned blue)
{
+#ifdef i386
struct { u_char blue, green, red, pad; } entry;
if (pmi_setpal) {
@@ -325,6 +328,8 @@
outb_p(green >> 10, dac_val);
outb_p(blue >> 10, dac_val);
}
+#endif
+
}
#endif
@@ -519,6 +524,10 @@
video_visual = (video_bpp == 8) ?
FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
+#ifndef __i386__
+ screen_info.vesapm_seg = 0;
+#endif
+
if (!request_mem_region(video_base, video_size, "vesafb")) {
printk(KERN_WARNING
"vesafb: abort, cannot reserve video memory at 0x%lx\n",
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)