diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2008-03-26 14:53:15 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2008-03-26 14:53:15 -0700 |
| commit | 588371ba15afffa9343629f0ea7ce530586eef0b (patch) | |
| tree | 565b60fe7c5f8065ba2abf4974360c283da66560 /src/i830_lvds.c | |
| parent | 52d6ced652059989e6d9780a149488ccd16e3a22 (diff) | |
| parent | c13efdd3d6d3846078766814b57306a7519bce18 (diff) | |
Merge branch 'master' into pfit
Diffstat (limited to 'src/i830_lvds.c')
| -rw-r--r-- | src/i830_lvds.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c index 01f5a414..28a51d98 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -1165,6 +1165,7 @@ i830_lvds_get_property(xf86OutputPtr output, Atom property) } #endif /* RANDR_13_INTERFACE */ +#ifdef RANDR_GET_CRTC_INTERFACE static xf86CrtcPtr i830_lvds_get_crtc(xf86OutputPtr output) { @@ -1174,6 +1175,7 @@ i830_lvds_get_crtc(xf86OutputPtr output) return i830_pipe_to_crtc(pScrn, pipe); } +#endif static const xf86OutputFuncsRec i830_lvds_output_funcs = { .create_resources = i830_lvds_create_resources, |