summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2008-01-25 18:16:20 -0800
committerAaron Plattner <aplattner@nvidia.com>2008-01-25 18:16:20 -0800
commite77c67e88e92cf03d3dfb4c58b6f6c09763673b0 (patch)
treedcfb8a04903db630883b3f30e671dc60682ed2ac
parent8ad00056f2471bfbb584f289740159e62e76ca7f (diff)
Fix warning.
(cherry picked from commit d2367140ad1fe96bce5e780332d21999e5aa31bf) Conflicts: src/g80_type.h
-rw-r--r--src/g80_ddc.c2
-rw-r--r--src/g80_type.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/g80_ddc.c b/src/g80_ddc.c
index 6af2267..284b9ab 100644
--- a/src/g80_ddc.c
+++ b/src/g80_ddc.c
@@ -34,7 +34,7 @@
#include <xf86DDC.h>
-static CARD32 G80FindLoadVal(const unsigned char *table1)
+static unsigned G80FindLoadVal(const unsigned char *table1)
{
const unsigned char *p = table1;
int count;
diff --git a/src/g80_type.h b/src/g80_type.h
index c63dc0f..6657c49 100644
--- a/src/g80_type.h
+++ b/src/g80_type.h
@@ -41,7 +41,7 @@ typedef struct G80Rec {
Head head;
ORType orType;
ORNum or;
- CARD32 loadVal;
+ unsigned loadVal;
xf86Int10InfoPtr int10;
int int10Mode; /* Console mode to restore */