diff options
author | Eric Anholt <eric@anholt.net> | 2008-03-11 12:07:52 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-03-11 12:07:52 -0700 |
commit | 9a62d3b598cca3c28fa8b6313bba82983cc29ecf (patch) | |
tree | b0775977594e601cba20d8d9bf53913bfac5b662 /src/i830_dvo.c | |
parent | 15f17aa682129c57d3864a355834edff06e91540 (diff) |
Remove i830+ driver's use of CARD*/INT* types for great justice.
Several uses are actually left, which are determined by the X Server
interfaces we're implementing.
Diffstat (limited to 'src/i830_dvo.c')
-rw-r--r-- | src/i830_dvo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_dvo.c b/src/i830_dvo.c index 81d56012..c0f76e30 100644 --- a/src/i830_dvo.c +++ b/src/i830_dvo.c @@ -226,7 +226,7 @@ i830_dvo_mode_set(xf86OutputPtr output, DisplayModePtr mode, I830OutputPrivatePtr intel_output = output->driver_private; struct _I830DVODriver *drv = intel_output->i2c_drv; int pipe = intel_crtc->pipe; - CARD32 dvo; + uint32_t dvo; unsigned int dvo_reg = drv->dvo_reg, dvo_srcdim_reg; int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B; @@ -358,7 +358,7 @@ i830_dvo_get_current_mode (xf86OutputPtr output) I830Ptr pI830 = I830PTR(pScrn); struct _I830DVODriver *drv = intel_output->i2c_drv; unsigned int dvo_reg = drv->dvo_reg; - CARD32 dvo = INREG(dvo_reg); + uint32_t dvo = INREG(dvo_reg); DisplayModePtr mode = NULL; /* If the DVO port is active, that'll be the LVDS, so we can pull out |