diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
| commit | 89034bc2c7b839702c00a704e79d112737f98be0 (patch) | |
| tree | e65b1f3d4c751baa840efc81bc4734f089379eb3 /drivers/video/via/lcd.c | |
| parent | fb82ad719831db58e9baa4c67015aae3fe27e7e3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/video/via/lcd.c')
| -rw-r--r-- | drivers/video/via/lcd.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c index 6c7290a6a447..78c6b3387947 100644 --- a/drivers/video/via/lcd.c +++ b/drivers/video/via/lcd.c | |||
| @@ -580,10 +580,7 @@ static void load_lcd_k400_patch_tbl(int set_hres, int set_vres, | |||
| 580 | int reg_num = 0; | 580 | int reg_num = 0; |
| 581 | struct io_reg *lcd_patch_reg = NULL; | 581 | struct io_reg *lcd_patch_reg = NULL; |
| 582 | 582 | ||
| 583 | if (viaparinfo->lvds_setting_info->iga_path == IGA2) | 583 | vmode_index = viafb_get_mode_index(set_hres, set_vres); |
| 584 | vmode_index = viafb_get_mode_index(set_hres, set_vres, 1); | ||
| 585 | else | ||
| 586 | vmode_index = viafb_get_mode_index(set_hres, set_vres, 0); | ||
| 587 | switch (panel_id) { | 584 | switch (panel_id) { |
| 588 | /* LCD 800x600 */ | 585 | /* LCD 800x600 */ |
| 589 | case LCD_PANEL_ID1_800X600: | 586 | case LCD_PANEL_ID1_800X600: |
| @@ -761,10 +758,7 @@ static void load_lcd_p880_patch_tbl(int set_hres, int set_vres, | |||
| 761 | int reg_num = 0; | 758 | int reg_num = 0; |
| 762 | struct io_reg *lcd_patch_reg = NULL; | 759 | struct io_reg *lcd_patch_reg = NULL; |
| 763 | 760 | ||
| 764 | if (viaparinfo->lvds_setting_info->iga_path == IGA2) | 761 | vmode_index = viafb_get_mode_index(set_hres, set_vres); |
| 765 | vmode_index = viafb_get_mode_index(set_hres, set_vres, 1); | ||
| 766 | else | ||
| 767 | vmode_index = viafb_get_mode_index(set_hres, set_vres, 0); | ||
| 768 | 762 | ||
| 769 | switch (panel_id) { | 763 | switch (panel_id) { |
| 770 | case LCD_PANEL_ID5_1400X1050: | 764 | case LCD_PANEL_ID5_1400X1050: |
| @@ -832,10 +826,7 @@ static void load_lcd_patch_regs(int set_hres, int set_vres, | |||
| 832 | { | 826 | { |
| 833 | int vmode_index; | 827 | int vmode_index; |
| 834 | 828 | ||
| 835 | if (viaparinfo->lvds_setting_info->iga_path == IGA2) | 829 | vmode_index = viafb_get_mode_index(set_hres, set_vres); |
| 836 | vmode_index = viafb_get_mode_index(set_hres, set_vres, 1); | ||
| 837 | else | ||
| 838 | vmode_index = viafb_get_mode_index(set_hres, set_vres, 0); | ||
| 839 | 830 | ||
| 840 | viafb_unlock_crt(); | 831 | viafb_unlock_crt(); |
| 841 | 832 | ||