xf86-video-nv: src/g80_output.c

[Aaron Plattner]

 src/g80_output.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 69aa963d7ab8256d0e932e1a5a98599f168b8836
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jun 30 13:30:07 2008 -0700

    Fix build by using CARD32 instead of uint32_t, like we do everywhere else.

diff --git a/src/g80_output.c b/src/g80_output.c
index e28b584..4c8448f 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -211,9 +211,9 @@ fail:
     return FALSE;
 }
 
-static uint32_t i2cAddr(const int port)
+static CARD32 i2cAddr(const int port)
 {
-    const uint32_t base = (port > 3) ? 0x0000E1E0 : 0x0000E138;
+    const CARD32 base = (port > 3) ? 0x0000E1E0 : 0x0000E138;
     return base + port * 0x18;
 }
 
@@ -297,7 +297,7 @@ ProbeDDC(I2CBusPtr i2c)
     G80Ptr pNv = G80PTR(pScrn);
     xf86MonPtr monInfo = NULL;
     const int bus = i2c->DriverPrivate.val;
-    const uint32_t addr = i2cAddr(bus);
+    const CARD32 addr = i2cAddr(bus);
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
             "Probing for EDID on I2C bus %i...\n", bus);