xserver: Branch 'master' - 2 commits

[Julien Cristau]

 hw/xfree86/common/xf86Helper.c |    8 ++++----
 hw/xfree86/xaa/xaaTables.c     |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6f18ea7e656b79e58f66f51067334414767b413f
Author: Julien Cristau <jcristau at debian.org>
Date:   Wed Nov 26 19:07:04 2008 +0100

    Typo fix

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 00df105..d626f67 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -2520,8 +2520,8 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
 
 /*
  *
- *  OBSOLETE ! xf86ConfigActivePciEntity() is an obsolete functions.
- *	       They the are likely to be removed. Don't use!
+ *  OBSOLETE ! xf86ConfigActivePciEntity() is an obsolete function.
+ *             It is likely to be removed. Don't use!
  */
 
 _X_EXPORT Bool
@@ -2555,10 +2555,10 @@ xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
 }
 
 /*
- * xf86ConfigPciEntityInactive() -- This functions can be used
+ * xf86ConfigPciEntityInactive() -- This function can be used
  * to configure an inactive entity as well as to reconfigure an
  * previously active entity inactive. If the entity has been
- * assigned to a screen before it will be removed. If p_pci is
+ * assigned to a screen before it will be removed. If p_chip is
  * non-NULL all static resources listed there will be registered.
  */
 _X_EXPORT void
commit efefc03f9b26738b69abb570c1af2167cc99c4d8
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Oct 26 13:19:48 2008 +0100

    Add missing include
    
    ../../../../hw/xfree86/xaa/xaaTables.c:9:14: warning: symbol 'byte_expand3' was not declared. Should it be static?
    ../../../../hw/xfree86/xaa/xaaTables.c:53:14: warning: symbol 'byte_reversed_expand3' was not declared. Should it be static?

diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c
index 829527d..c7fa28a 100644
--- a/hw/xfree86/xaa/xaaTables.c
+++ b/hw/xfree86/xaa/xaaTables.c
@@ -1,4 +1,4 @@
-
+#include "xaalocal.h"
 /*
  * This is a table of 24-bit values, indexed with an 8-bit byte value, then
  * expands each bit to three consecutive bits. This is required for color