summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-11-19 17:09:11 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2006-11-19 17:09:11 +0100
commit2dd0892817090709b2fb7ffba920595ada00fcad (patch)
treebd8da9757fd5019352f46cc3957be2c590d62157
parent8c1b9269aaac746989bdb9be02915722bcf6fec0 (diff)
Fix compile warnings.
-rw-r--r--src/radeon_display.c2
-rw-r--r--src/radeon_driver.c1
-rw-r--r--src/radeon_modes.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c
index 6aa87d47..9c8a3dbc 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -925,7 +925,6 @@ void RADEONSetupConnectors(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
- unsigned char *RADEONMMIO = info->MMIO;
const char *s;
Bool ignore_edid = FALSE;
int i = 0, second = 0, max_mt = 5;
@@ -1149,7 +1148,6 @@ static void RADEONQueryConnectedDisplays(ScrnInfoPtr pScrn)
unsigned char *RADEONMMIO = info->MMIO;
const char *s;
Bool ignore_edid = FALSE;
- int i = 0, second = 0, max_mt = 5;
/* IgnoreEDID option is different from the NoDDCxx options used by DDC module
* When IgnoreEDID is used, monitor detection will still use DDC
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index e833c7fa..f5a84215 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6349,7 +6349,6 @@ static Bool RADEONInit(ScrnInfoPtr pScrn, DisplayModePtr mode,
RADEONSavePtr save)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
- RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
if (info->IsSecondary) {
return RADEONInit2(pScrn, NULL, mode, 2, save);
diff --git a/src/radeon_modes.c b/src/radeon_modes.c
index 132f0885..cf8ab898 100644
--- a/src/radeon_modes.c
+++ b/src/radeon_modes.c
@@ -40,7 +40,7 @@
#include <string.h>
#include <stdio.h>
-#include "xf86str.h"
+#include "xf86.h"
/* Driver data structures */
#include "radeon.h"
#include "radeon_reg.h"