diff options
Diffstat (limited to 'drivers/video/sis/sis_main.h')
-rw-r--r-- | drivers/video/sis/sis_main.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h index 9540e977270e..32e23c209430 100644 --- a/drivers/video/sis/sis_main.h +++ b/drivers/video/sis/sis_main.h | |||
@@ -98,7 +98,7 @@ static struct sisfb_chip_info { | |||
98 | int hwcursor_size; | 98 | int hwcursor_size; |
99 | int CRT2_write_enable; | 99 | int CRT2_write_enable; |
100 | const char *chip_name; | 100 | const char *chip_name; |
101 | } sisfb_chip_info[] __devinitdata = { | 101 | } sisfb_chip_info[] = { |
102 | { SIS_300, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 300/305" }, | 102 | { SIS_300, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 300/305" }, |
103 | { SIS_540, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 540" }, | 103 | { SIS_540, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 540" }, |
104 | { SIS_630, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 630" }, | 104 | { SIS_630, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 630" }, |
@@ -113,7 +113,7 @@ static struct sisfb_chip_info { | |||
113 | { XGI_40, SIS_315_VGA, 1, HW_CURSOR_AREA_SIZE_315 * 4, SIS_CRT2_WENABLE_315, "XGI V3XT/V5/V8" }, | 113 | { XGI_40, SIS_315_VGA, 1, HW_CURSOR_AREA_SIZE_315 * 4, SIS_CRT2_WENABLE_315, "XGI V3XT/V5/V8" }, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static struct pci_device_id __devinitdata sisfb_pci_table[] = { | 116 | static struct pci_device_id sisfb_pci_table[] = { |
117 | #ifdef CONFIG_FB_SIS_300 | 117 | #ifdef CONFIG_FB_SIS_300 |
118 | { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 118 | { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
119 | { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, | 119 | { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, |
@@ -317,7 +317,7 @@ static struct _sis_lcd_data { | |||
317 | u16 xres; | 317 | u16 xres; |
318 | u16 yres; | 318 | u16 yres; |
319 | u8 default_mode_idx; | 319 | u8 default_mode_idx; |
320 | } sis_lcd_data[] __devinitdata = { | 320 | } sis_lcd_data[] = { |
321 | { LCD_640x480, 640, 480, 23 }, | 321 | { LCD_640x480, 640, 480, 23 }, |
322 | { LCD_800x600, 800, 600, 43 }, | 322 | { LCD_800x600, 800, 600, 43 }, |
323 | { LCD_1024x600, 1024, 600, 67 }, | 323 | { LCD_1024x600, 1024, 600, 67 }, |
@@ -339,21 +339,21 @@ static struct _sis_lcd_data { | |||
339 | }; | 339 | }; |
340 | 340 | ||
341 | /* CR36 evaluation */ | 341 | /* CR36 evaluation */ |
342 | static unsigned short sis300paneltype[] __devinitdata = { | 342 | static unsigned short sis300paneltype[] = { |
343 | LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, | 343 | LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, |
344 | LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768, | 344 | LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768, |
345 | LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, | 345 | LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, |
346 | LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN | 346 | LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN |
347 | }; | 347 | }; |
348 | 348 | ||
349 | static unsigned short sis310paneltype[] __devinitdata = { | 349 | static unsigned short sis310paneltype[] = { |
350 | LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, | 350 | LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, |
351 | LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, | 351 | LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, |
352 | LCD_1152x768, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, | 352 | LCD_1152x768, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, |
353 | LCD_320x240_2, LCD_320x240_3, LCD_UNKNOWN, LCD_UNKNOWN | 353 | LCD_320x240_2, LCD_320x240_3, LCD_UNKNOWN, LCD_UNKNOWN |
354 | }; | 354 | }; |
355 | 355 | ||
356 | static unsigned short sis661paneltype[] __devinitdata = { | 356 | static unsigned short sis661paneltype[] = { |
357 | LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, | 357 | LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, |
358 | LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, | 358 | LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, |
359 | LCD_1280x854, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, | 359 | LCD_1280x854, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, |
@@ -466,7 +466,7 @@ static struct _sisfbddcsmodes { | |||
466 | u16 h; | 466 | u16 h; |
467 | u16 v; | 467 | u16 v; |
468 | u32 d; | 468 | u32 d; |
469 | } sisfb_ddcsmodes[] __devinitdata = { | 469 | } sisfb_ddcsmodes[] = { |
470 | { 0x10000, 67, 75, 108000}, | 470 | { 0x10000, 67, 75, 108000}, |
471 | { 0x08000, 48, 72, 50000}, | 471 | { 0x08000, 48, 72, 50000}, |
472 | { 0x04000, 46, 75, 49500}, | 472 | { 0x04000, 46, 75, 49500}, |
@@ -488,7 +488,7 @@ static struct _sisfbddcfmodes { | |||
488 | u16 v; | 488 | u16 v; |
489 | u16 h; | 489 | u16 h; |
490 | u32 d; | 490 | u32 d; |
491 | } sisfb_ddcfmodes[] __devinitdata = { | 491 | } sisfb_ddcfmodes[] = { |
492 | { 1280, 1024, 85, 92, 157500}, | 492 | { 1280, 1024, 85, 92, 157500}, |
493 | { 1600, 1200, 60, 75, 162000}, | 493 | { 1600, 1200, 60, 75, 162000}, |
494 | { 1600, 1200, 65, 82, 175500}, | 494 | { 1600, 1200, 65, 82, 175500}, |
@@ -505,7 +505,7 @@ static struct _chswtable { | |||
505 | u16 subsysCard; | 505 | u16 subsysCard; |
506 | char *vendorName; | 506 | char *vendorName; |
507 | char *cardName; | 507 | char *cardName; |
508 | } mychswtable[] __devinitdata = { | 508 | } mychswtable[] = { |
509 | { 0x1631, 0x1002, "Mitachi", "0x1002" }, | 509 | { 0x1631, 0x1002, "Mitachi", "0x1002" }, |
510 | { 0x1071, 0x7521, "Mitac" , "7521P" }, | 510 | { 0x1071, 0x7521, "Mitac" , "7521P" }, |
511 | { 0, 0, "" , "" } | 511 | { 0, 0, "" , "" } |
@@ -525,7 +525,7 @@ static struct _customttable { | |||
525 | char *cardName; | 525 | char *cardName; |
526 | u32 SpecialID; | 526 | u32 SpecialID; |
527 | char *optionName; | 527 | char *optionName; |
528 | } mycustomttable[] __devinitdata = { | 528 | } mycustomttable[] = { |
529 | { SIS_630, "2.00.07", "09/27/2002-13:38:25", | 529 | { SIS_630, "2.00.07", "09/27/2002-13:38:25", |
530 | 0x3240A8, | 530 | 0x3240A8, |
531 | { 0x220, 0x227, 0x228, 0x229, 0x0ee }, | 531 | { 0x220, 0x227, 0x228, 0x229, 0x0ee }, |