diff options
Diffstat (limited to 'drivers/video/nvidia/nv_setup.c')
-rw-r--r-- | drivers/video/nvidia/nv_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c index 0bbdca2e0f91..11c84178f420 100644 --- a/drivers/video/nvidia/nv_setup.c +++ b/drivers/video/nvidia/nv_setup.c | |||
@@ -401,7 +401,7 @@ void NVCommonSetup(struct fb_info *info) | |||
401 | nvidia_create_i2c_busses(par); | 401 | nvidia_create_i2c_busses(par); |
402 | if (!par->twoHeads) { | 402 | if (!par->twoHeads) { |
403 | par->CRTCnumber = 0; | 403 | par->CRTCnumber = 0; |
404 | nvidia_probe_i2c_connector(par, 1, &edidA); | 404 | nvidia_probe_i2c_connector(info, 1, &edidA); |
405 | if (edidA && !fb_parse_edid(edidA, &var)) { | 405 | if (edidA && !fb_parse_edid(edidA, &var)) { |
406 | printk("nvidiafb: EDID found from BUS1\n"); | 406 | printk("nvidiafb: EDID found from BUS1\n"); |
407 | monA = &monitorA; | 407 | monA = &monitorA; |
@@ -488,14 +488,14 @@ void NVCommonSetup(struct fb_info *info) | |||
488 | oldhead = NV_RD32(par->PCRTC0, 0x00000860); | 488 | oldhead = NV_RD32(par->PCRTC0, 0x00000860); |
489 | NV_WR32(par->PCRTC0, 0x00000860, oldhead | 0x00000010); | 489 | NV_WR32(par->PCRTC0, 0x00000860, oldhead | 0x00000010); |
490 | 490 | ||
491 | nvidia_probe_i2c_connector(par, 1, &edidA); | 491 | nvidia_probe_i2c_connector(info, 1, &edidA); |
492 | if (edidA && !fb_parse_edid(edidA, &var)) { | 492 | if (edidA && !fb_parse_edid(edidA, &var)) { |
493 | printk("nvidiafb: EDID found from BUS1\n"); | 493 | printk("nvidiafb: EDID found from BUS1\n"); |
494 | monA = &monitorA; | 494 | monA = &monitorA; |
495 | fb_edid_to_monspecs(edidA, monA); | 495 | fb_edid_to_monspecs(edidA, monA); |
496 | } | 496 | } |
497 | 497 | ||
498 | nvidia_probe_i2c_connector(par, 2, &edidB); | 498 | nvidia_probe_i2c_connector(info, 2, &edidB); |
499 | if (edidB && !fb_parse_edid(edidB, &var)) { | 499 | if (edidB && !fb_parse_edid(edidB, &var)) { |
500 | printk("nvidiafb: EDID found from BUS2\n"); | 500 | printk("nvidiafb: EDID found from BUS2\n"); |
501 | monB = &monitorB; | 501 | monB = &monitorB; |