xserver: Branch 'master' - 4 commits

[Keith Packard]

 hw/xfree86/common/Makefile.am  |    2 --
 hw/xfree86/common/xf86Config.c |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit c9c0f93f8ed42413a05193ee71c69fa6b41f6a03
Merge: 73f6de1... 4132b1c...
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Nov 10 16:11:29 2010 -0800

    Merge remote branch 'whot/for-keith'

commit 4132b1c591bd01c29df91b88afbd144647da9ed8
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Oct 21 14:04:42 2010 +1000

    xfree86: fix compiler warnings - unused variable i
    
    ../../../../hw/xfree86/common/xf86Config.c: In function 'configDRI':
    ../../../../hw/xfree86/common/xf86Config.c:2213:9: warning: unused variable
    'i'
    
    Introduced in 788bfbf18ac19923604b0d676933fdc0d78526a1
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index dea3c9b..e3b2831 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2210,7 +2210,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
 static void
 configDRI(XF86ConfDRIPtr drip)
 {
-    int                i;
     struct group       *grp;
 
     xf86ConfigDRI.group      = -1;
commit 6b982d73bb8878238ed46665b220a94a591e11a9
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Oct 21 13:53:35 2010 +1000

    xfree86: fix two compiler warnings - unused variable ati, atimisc
    
    ../../../../hw/xfree86/common/xf86Config.c: In function
    'fixup_video_driver_list':
    ../../../../hw/xfree86/common/xf86Config.c:507:19: warning: unused variable
    'atimisc'
    ../../../../hw/xfree86/common/xf86Config.c:507:12: warning: unused variable
    'ati'
    
    Introduced in 52577ae8eeda64601db8dd425027cf8e4271b873.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 92fb74d..dea3c9b 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -504,7 +504,6 @@ fixup_video_driver_list(char **drivers)
     static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL };
     char **end, **drv;
     char *x;
-    char **ati, **atimisc;
     int i;
 
     /* walk to the end of the list */
commit 0799f0771cca335d6400a8494ba236a0d10e122b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Nov 4 12:53:18 2010 +1000

    xfree86: remove two unused variables from Makefile.am
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Julien Cristau <jcristau at debian.org>

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 821a2b5..989208f 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -17,8 +17,6 @@ if DGA
 DGASOURCES = xf86DGA.c
 endif
 
-XISOURCES = xf86Xinput.c xisb.c
-XISDKINCS = xf86Xinput.h xisb.h
 RANDRSOURCES = xf86RandR.c
 
 BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)