summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-12-18 03:03:11 -0500
committerAlex Deucher <alex@botch2.(none)>2007-12-18 03:03:11 -0500
commitbd7206fa120495037e3fea0c920d0031d7715bf6 (patch)
tree305802e5aa0fc874cd6800913255e7910dcad36f
parent65a3ac7530e11bb7d818a988fd0cf1dde7688fa4 (diff)
RADEON: fix another merge error
this broken legacy radeons
-rw-r--r--src/radeon_crtc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index eb892f24..2d4ac15e 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -953,7 +953,7 @@ legacy_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
dot_clock = adjusted_mode->Clock / 1000.0;
if (dot_clock) {
ErrorF("init pll1\n");
- RADEONInitPLLRegisters(pScrn, &info->ModeReg, &info->pll, adjusted_mode, pll_flags);
+ RADEONInitPLLRegisters(pScrn, info->ModeReg, &info->pll, adjusted_mode, pll_flags);
} else {
info->ModeReg->ppll_ref_div = info->SavedReg->ppll_ref_div;
info->ModeReg->ppll_div_3 = info->SavedReg->ppll_div_3;
@@ -967,7 +967,7 @@ legacy_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
dot_clock = adjusted_mode->Clock / 1000.0;
if (dot_clock) {
ErrorF("init pll2\n");
- RADEONInitPLL2Registers(pScrn, &info->ModeReg, &info->pll, adjusted_mode, pll_flags);
+ RADEONInitPLL2Registers(pScrn, info->ModeReg, &info->pll, adjusted_mode, pll_flags);
}
break;
}