diff options
| author | Owain G. Ainsworth <oga@openbsd.org> | 2010-09-12 02:57:23 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-09-12 02:57:23 +0100 |
| commit | 63cd5081105b184843305a830680b195a907555a (patch) | |
| tree | 5ed4f62414564ec18be69fa0b516626267767879 /src/i830_lvds.c | |
| parent | 40bd43d1697e4ab34cf06088998bf4197c407126 (diff) | |
Rename common infrastructure to the intel namespace.
After splitting out the i810 driver into its own legacy directory, we
can identify the common routines not as i830 but as intel. This
clarifies the code which *is* i830 specific.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 5c663ce8442bd3b69c96e29061c57cc565fca91d)
Conflicts:
src/Makefile.am
src/drmmode_display.c
src/intel.h
src/intel_batchbuffer.c
src/intel_dri.c
src/intel_driver.c
src/intel_memory.c
src/intel_video.c
src/xvmc/intel_xvmc.h
OGA: adapted for ums
Diffstat (limited to 'src/i830_lvds.c')
| -rw-r--r-- | src/i830_lvds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c index d2e97c3a..3d3208e4 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -40,7 +40,7 @@ #include <sys/types.h> #include "xf86.h" -#include "i830.h" +#include "intel.h" #include "i830_reg.h" #include "i830_bios.h" #include "i830_display.h" @@ -1495,7 +1495,7 @@ i830_lvds_get_crtc(xf86OutputPtr output) intel_screen_private *intel = intel_get_screen_private(scrn); int pipe = !!(INREG(LVDS) & LVDS_PIPEB_SELECT); - return i830_pipe_to_crtc(scrn, pipe); + return intel_pipe_to_crtc(scrn, pipe); } #endif |