xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 51e51f864a691e51b5193d102398ced667e0beb1
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 11 18:48:40 2010 +1000

    evergreen: remove warnings since last commit

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index ae2f525..89b7713 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4600,7 +4600,7 @@ evergreen_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
     RADEONInfoPtr info = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     struct avivo_state *state = &save->avivo;
-    int i, j;
+    int i;
 
     state->vga1_cntl = INREG(AVIVO_D1VGA_CONTROL);
     state->vga2_cntl = INREG(AVIVO_D2VGA_CONTROL);
@@ -4988,7 +4988,7 @@ evergreen_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore)
     RADEONInfoPtr info = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     struct avivo_state *state = &restore->avivo;
-    int i, j;
+    int i;
 
     OUTREG(AVIVO_D1VGA_CONTROL, state->vga1_cntl);
     OUTREG(AVIVO_D2VGA_CONTROL, state->vga2_cntl);;