From ad4abba20b8a6db7b52898bc7159809539cbed43 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Tue, 27 Mar 2007 14:49:30 -0700
Subject: Fix warnings.

---
 src/g80_driver.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/g80_driver.c')

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 6d19cce..8dff209 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -30,6 +30,7 @@
 
 #include <xf86_OSproc.h>
 #include <xf86Resources.h>
+#include <xf86RandR12.h>
 #include <mipointer.h>
 #include <mibstore.h>
 #include <micmap.h>
@@ -44,6 +45,7 @@
 #include "g80_display.h"
 #include "g80_ddc.h"
 #include "g80_dma.h"
+#include "g80_output.h"
 #include "g80_xaa.h"
 
 #define G80_REG_SIZE (1024 * 1024 * 16)
@@ -119,6 +121,7 @@ G80FreeRec(ScrnInfoPtr pScrn)
     pScrn->driverPrivate = NULL;
 }
 
+static Bool
 G80ResizeScreen(ScrnInfoPtr pScrn, int width, int height)
 {
     G80Ptr pNv = G80PTR(pScrn);
@@ -161,7 +164,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     PCITAG pcitag;
     MessageType from;
     Bool primary;
-    char *s;
     const rgb zeros = {0, 0, 0};
     const Gamma gzeros = {0.0, 0.0, 0.0};
     CARD32 tmp;
@@ -395,7 +397,7 @@ fail:
 static Bool
 AcquireDisplay(ScrnInfoPtr pScrn)
 {
-    G80Ptr pNv = G80PTR(pScrn);
+//    G80Ptr pNv = G80PTR(pScrn);
 
     if(!G80DispInit(pScrn))
         return FALSE;
-- 
cgit v1.2.3