aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/via/viafbdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/via/viafbdev.c')
-rw-r--r--drivers/video/via/viafbdev.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 902f8a1ac6b1..bb0f616b7d44 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -26,13 +26,17 @@
26 26
27#include "global.h" 27#include "global.h"
28 28
29static struct fb_var_screeninfo default_var;
30static char *viafb_name = "Via"; 29static char *viafb_name = "Via";
31static u32 pseudo_pal[17]; 30static u32 pseudo_pal[17];
32 31
33/* video mode */ 32/* video mode */
34static char *viafb_mode; 33static char *viafb_mode;
35static char *viafb_mode1; 34static char *viafb_mode1;
35static int viafb_bpp = 32;
36static int viafb_bpp1 = 32;
37
38static unsigned int viafb_second_offset;
39static int viafb_second_size;
36 40
37static int viafb_accel = 1; 41static int viafb_accel = 1;
38 42
@@ -1849,10 +1853,11 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
1849{ 1853{
1850 u32 default_xres, default_yres; 1854 u32 default_xres, default_yres;
1851 struct VideoModeTable *vmode_entry; 1855 struct VideoModeTable *vmode_entry;
1856 struct fb_var_screeninfo default_var;
1852 u32 viafb_par_length; 1857 u32 viafb_par_length;
1853 1858
1854 DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n"); 1859 DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n");
1855 1860 memset(&default_var, 0, sizeof(default_var));
1856 viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8); 1861 viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8);
1857 1862
1858 /* Allocate fb_info and ***_par here, also including some other needed 1863 /* Allocate fb_info and ***_par here, also including some other needed