aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/vesafb.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 638ee3745401..e16322d157d0 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -47,17 +47,16 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
47 .accel = FB_ACCEL_NONE, 47 .accel = FB_ACCEL_NONE,
48}; 48};
49 49
50static int inverse = 0; 50static int inverse __read_mostly;
51static int mtrr = 0; /* disable mtrr */ 51static int mtrr __read_mostly; /* disable mtrr */
52static int vram_remap __initdata = 0; /* Set amount of memory to be used */ 52static int vram_remap __initdata; /* Set amount of memory to be used */
53static int vram_total __initdata = 0; /* Set total amount of memory */ 53static int vram_total __initdata; /* Set total amount of memory */
54static int pmi_setpal = 1; /* pmi for palette changes ??? */ 54static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55static int ypan = 0; /* 0..nothing, 1..ypan, 2..ywrap */ 55static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56static unsigned short *pmi_base = NULL; 56static void (*pmi_start)(void) __read_mostly;
57static void (*pmi_start)(void); 57static void (*pmi_pal) (void) __read_mostly;
58static void (*pmi_pal)(void); 58static int depth __read_mostly;
59static int depth; 59static int vga_compat __read_mostly;
60static int vga_compat;
61/* --------------------------------------------------------------------- */ 60/* --------------------------------------------------------------------- */
62 61
63static int vesafb_pan_display(struct fb_var_screeninfo *var, 62static int vesafb_pan_display(struct fb_var_screeninfo *var,
@@ -312,6 +311,7 @@ static int __init vesafb_probe(struct platform_device *dev)
312 ypan = pmi_setpal = 0; /* not available or some DOS TSR ... */ 311 ypan = pmi_setpal = 0; /* not available or some DOS TSR ... */
313 312
314 if (ypan || pmi_setpal) { 313 if (ypan || pmi_setpal) {
314 unsigned short *pmi_base;
315 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off); 315 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
316 pmi_start = (void*)((char*)pmi_base + pmi_base[1]); 316 pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
317 pmi_pal = (void*)((char*)pmi_base + pmi_base[2]); 317 pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);