aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/via/viafbdev.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-03-20 21:46:24 -0400
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-03-21 17:47:22 -0400
commit0523656eed6941a1a0e6b8de36ca73f44d2142c0 (patch)
tree48f44dcb400c515dcc1aea0f6c9d03845aff8131 /drivers/video/via/viafbdev.c
parent486d4c08dd2eb29b26b4a27f8056155a7a639861 (diff)
viafb: kill crt_setting_information
As the iga path is the only remaining information which is also handled by the active devices there is no reason to keep it. Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via/viafbdev.c')
-rw-r--r--drivers/video/via/viafbdev.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 9d9bb9b4ed3f..ed9bd7978cc0 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -930,10 +930,8 @@ static int get_primary_device(void)
930 /* Rule: device on iga1 path are the primary device. */ 930 /* Rule: device on iga1 path are the primary device. */
931 if (viafb_SAMM_ON) { 931 if (viafb_SAMM_ON) {
932 if (viafb_CRT_ON) { 932 if (viafb_CRT_ON) {
933 if (viaparinfo->crt_setting_info->iga_path == IGA1) { 933 if (viaparinfo->shared->iga1_devices & VIA_CRT) {
934 DEBUG_MSG(KERN_INFO "CRT IGA Path:%d\n", 934 DEBUG_MSG(KERN_INFO "CRT IGA Path:%d\n", IGA1);
935 viaparinfo->
936 crt_setting_info->iga_path);
937 primary_device = CRT_Device; 935 primary_device = CRT_Device;
938 } 936 }
939 } 937 }
@@ -1746,7 +1744,6 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
1746 viaparinfo->lvds_setting_info = &viaparinfo->shared->lvds_setting_info; 1744 viaparinfo->lvds_setting_info = &viaparinfo->shared->lvds_setting_info;
1747 viaparinfo->lvds_setting_info2 = 1745 viaparinfo->lvds_setting_info2 =
1748 &viaparinfo->shared->lvds_setting_info2; 1746 &viaparinfo->shared->lvds_setting_info2;
1749 viaparinfo->crt_setting_info = &viaparinfo->shared->crt_setting_info;
1750 viaparinfo->chip_info = &viaparinfo->shared->chip_info; 1747 viaparinfo->chip_info = &viaparinfo->shared->chip_info;
1751 1748
1752 if (viafb_dual_fb) 1749 if (viafb_dual_fb)